Merge commit 'goog/master' into merge_master

492 files changed, 67879 insertions, 7733 deletions

diff --git a/Android.mk b/Android.mk
index 219ccadb129d..88f023feccde 100644
--- a/Android.mk
+++ b/Android.mk
@@ -99,6 +99,8 @@ LOCAL_SRC_FILES += \
 	core/java/android/view/IWindow.aidl \
 	core/java/android/view/IWindowManager.aidl \
 	core/java/android/view/IWindowSession.aidl \
+	core/java/android/speech/IRecognitionListener.aidl \
+	core/java/android/speech/IRecognitionService.aidl \
 	core/java/com/android/internal/app/IBatteryStats.aidl \
 	core/java/com/android/internal/app/IUsageStats.aidl \
 	core/java/com/android/internal/appwidget/IAppWidgetService.aidl \
@@ -112,6 +114,7 @@ LOCAL_SRC_FILES += \
 	core/java/com/android/internal/view/IInputMethodManager.aidl \
 	core/java/com/android/internal/view/IInputMethodSession.aidl \
 	im/java/android/im/IImPlugin.aidl \
+	location/java/android/location/IGeocodeProvider.aidl \
 	location/java/android/location/IGpsStatusListener.aidl \
 	location/java/android/location/ILocationCollector.aidl \
 	location/java/android/location/ILocationListener.aidl \
@@ -300,12 +303,6 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \
 
 framework_docs_LOCAL_ADDITIONAL_JAVA_DIR:=$(call intermediates-dir-for,JAVA_LIBRARIES,framework)
 
-web_docs_sample_code_flags := \
-		-hdf android.hasSamples 1 \
-		-samplecode samples/ApiDemos guide/samples/ApiDemos "API Demos" \
-		-samplecode samples/LunarLander guide/samples/LunarLander "Lunar Lander" \
-		-samplecode samples/NotePad guide/samples/NotePad "Note Pad"
-
 sample_dir := development/samples
 
 web_docs_sample_code_flags := \
@@ -317,6 +314,19 @@ web_docs_sample_code_flags := \
 		-samplecode $(sample_dir)/NotePad \
 		            guide/samples/NotePad "Note Pad"
 
+# SDK version identifiers used in the published docs. 
+
+# major[.minor] version for SDK. Typically identical to the 
+# most current Android platform version included in the SDK package. 
+framework_docs_SDK_VERSION :=  1.5
+# release version for SDK (ie "Release x")
+framework_docs_SDK_REL_ID :=   1
+framework_docs_SDK_CURRENT_DIR := $(framework_docs_SDK_VERSION)_r$(framework_docs_SDK_REL_ID)
+
+framework_docs_LOCAL_DROIDDOC_OPTIONS += \
+		-hdf sdk.version $(framework_docs_SDK_VERSION) \
+		-hdf sdk.rel.id $(framework_docs_SDK_REL_ID) \
+		-hdf sdk.current $(framework_docs_SDK_CURRENT_DIR)
 
 # ====  static html in the sdk ==================================
 include $(CLEAR_VARS)
@@ -349,7 +359,7 @@ include $(BUILD_DROIDDOC)
 
 static_doc_index_redirect := $(out_dir)/index.html
 $(static_doc_index_redirect): \
-		$(LOCAL_PATH)/docs/docs-documentation-redirect.html | $(ACP)
+	$(LOCAL_PATH)/docs/docs-documentation-redirect.html | $(ACP)
 	$(hide) mkdir -p $(dir $@)
 	$(hide) $(ACP) $< $@
 
@@ -374,10 +384,10 @@ LOCAL_ADDITIONAL_JAVA_DIR:=$(framework_docs_LOCAL_ADDITIONAL_JAVA_DIR)
 LOCAL_MODULE := online-sdk
 
 LOCAL_DROIDDOC_OPTIONS:= \
-	$(framework_docs_LOCAL_DROIDDOC_OPTIONS) \
-	$(web_docs_sample_code_flags) \
-	-toroot / \
-    -hdf android.whichdoc online
+		$(framework_docs_LOCAL_DROIDDOC_OPTIONS) \
+		$(web_docs_sample_code_flags) \
+		-toroot / \
+		-hdf android.whichdoc online
 
 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
 LOCAL_DROIDDOC_CUSTOM_ASSET_DIR:=assets-sdk
diff --git a/api/current.xml b/api/current.xml
index adb1954a2f5a..caffcaf5aa3c 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -12569,6 +12569,8 @@
 </parameter>
 <parameter name="authTokenType" type="java.lang.String">
 </parameter>
+<parameter name="requiredFeatures" type="java.lang.String[]">
+</parameter>
 <parameter name="options" type="android.os.Bundle">
 </parameter>
 <exception name="NetworkErrorException" type="android.accounts.NetworkErrorException">
@@ -12655,6 +12657,25 @@
  visibility="public"
 >
 </method>
+<method name="hasFeatures"
+ return="android.os.Bundle"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="response" type="android.accounts.AccountAuthenticatorResponse">
+</parameter>
+<parameter name="account" type="android.accounts.Account">
+</parameter>
+<parameter name="features" type="java.lang.String[]">
+</parameter>
+<exception name="NetworkErrorException" type="android.accounts.NetworkErrorException">
+</exception>
+</method>
 <method name="updateCredentials"
  return="android.os.Bundle"
  abstract="true"
@@ -13025,18 +13046,6 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<constructor name="AccountManager"
- type="android.accounts.AccountManager"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="context" type="android.content.Context">
-</parameter>
-<parameter name="service" type="android.accounts.IAccountManager">
-</parameter>
-</constructor>
 <method name="addAccount"
  return="android.accounts.Future2"
  abstract="false"
@@ -13051,6 +13060,8 @@
 </parameter>
 <parameter name="authTokenType" type="java.lang.String">
 </parameter>
+<parameter name="requiredFeatures" type="java.lang.String[]">
+</parameter>
 <parameter name="addAccountOptions" type="android.os.Bundle">
 </parameter>
 <parameter name="activity" type="android.app.Activity">
@@ -13081,6 +13092,23 @@
 <parameter name="handler" type="android.os.Handler">
 </parameter>
 </method>
+<method name="addOnAccountsUpdatedListener"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="listener" type="android.accounts.OnAccountsUpdatedListener">
+</parameter>
+<parameter name="handler" type="android.os.Handler">
+</parameter>
+<parameter name="updateImmediately" type="boolean">
+</parameter>
+</method>
 <method name="blockingAddAccountExplicitly"
  return="boolean"
  abstract="false"
@@ -13135,6 +13163,27 @@
 <parameter name="accountType" type="java.lang.String">
 </parameter>
 </method>
+<method name="blockingGetAccountsWithTypeAndFeatures"
+ return="android.accounts.Account[]"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="type" type="java.lang.String">
+</parameter>
+<parameter name="features" type="java.lang.String[]">
+</parameter>
+<exception name="AuthenticatorException" type="android.accounts.AuthenticatorException">
+</exception>
+<exception name="IOException" type="java.io.IOException">
+</exception>
+<exception name="OperationCanceledException" type="android.accounts.OperationCanceledException">
+</exception>
+</method>
 <method name="blockingGetAuthToken"
  return="java.lang.String"
  abstract="false"
@@ -13408,6 +13457,25 @@
 <parameter name="handler" type="android.os.Handler">
 </parameter>
 </method>
+<method name="getAccountsWithTypeAndFeatures"
+ return="android.accounts.Future2"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="type" type="java.lang.String">
+</parameter>
+<parameter name="features" type="java.lang.String[]">
+</parameter>
+<parameter name="callback" type="android.accounts.Future2Callback">
+</parameter>
+<parameter name="handler" type="android.os.Handler">
+</parameter>
+</method>
 <method name="getAuthToken"
  return="android.accounts.Future2"
  abstract="false"
@@ -13452,6 +13520,33 @@
 <parameter name="handler" type="android.os.Handler">
 </parameter>
 </method>
+<method name="getAuthTokenByFeatures"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="accountType" type="java.lang.String">
+</parameter>
+<parameter name="authTokenType" type="java.lang.String">
+</parameter>
+<parameter name="features" type="java.lang.String[]">
+</parameter>
+<parameter name="activityForPrompting" type="android.app.Activity">
+</parameter>
+<parameter name="addAccountOptions" type="android.os.Bundle">
+</parameter>
+<parameter name="loginOptions" type="android.os.Bundle">
+</parameter>
+<parameter name="callback" type="android.accounts.Future2Callback">
+</parameter>
+<parameter name="handler" type="android.os.Handler">
+</parameter>
+</method>
 <method name="getAuthenticatorTypes"
  return="android.accounts.Future1&lt;java.lang.String[]&gt;"
  abstract="false"
@@ -13558,6 +13653,19 @@
 <parameter name="handler" type="android.os.Handler">
 </parameter>
 </method>
+<method name="removeOnAccountsUpdatedListener"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="listener" type="android.accounts.OnAccountsUpdatedListener">
+</parameter>
+</method>
 <method name="setAuthToken"
  return="android.accounts.Future1&lt;java.lang.Void&gt;"
  abstract="false"
@@ -13643,615 +13751,6 @@
 </parameter>
 </method>
 </class>
-<class name="AccountManager.AMSTaskBoolean"
- extends="java.util.concurrent.FutureTask"
- abstract="true"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<implements name="android.accounts.Future1">
-</implements>
-<constructor name="AccountManager.AMSTaskBoolean"
- type="android.accounts.AccountManager.AMSTaskBoolean"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="handler" type="android.os.Handler">
-</parameter>
-<parameter name="callback" type="android.accounts.Future1Callback&lt;java.lang.Boolean&gt;">
-</parameter>
-</constructor>
-<method name="doWork"
- return="void"
- abstract="true"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<exception name="RemoteException" type="android.os.RemoteException">
-</exception>
-</method>
-<method name="getResult"
- return="java.lang.Boolean"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<exception name="OperationCanceledException" type="android.accounts.OperationCanceledException">
-</exception>
-</method>
-<method name="getResult"
- return="java.lang.Boolean"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="timeout" type="long">
-</parameter>
-<parameter name="unit" type="java.util.concurrent.TimeUnit">
-</parameter>
-<exception name="OperationCanceledException" type="android.accounts.OperationCanceledException">
-</exception>
-</method>
-</class>
-<class name="AccountManager.AmsTask"
- extends="java.util.concurrent.FutureTask"
- abstract="true"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<implements name="android.accounts.Future2">
-</implements>
-<constructor name="AccountManager.AmsTask"
- type="android.accounts.AccountManager.AmsTask"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="activity" type="android.app.Activity">
-</parameter>
-<parameter name="handler" type="android.os.Handler">
-</parameter>
-<parameter name="callback" type="android.accounts.Future2Callback">
-</parameter>
-</constructor>
-<method name="doWork"
- return="void"
- abstract="true"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<exception name="RemoteException" type="android.os.RemoteException">
-</exception>
-</method>
-<method name="getResult"
- return="android.os.Bundle"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<exception name="AuthenticatorException" type="android.accounts.AuthenticatorException">
-</exception>
-<exception name="IOException" type="java.io.IOException">
-</exception>
-<exception name="OperationCanceledException" type="android.accounts.OperationCanceledException">
-</exception>
-</method>
-<method name="getResult"
- return="android.os.Bundle"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="timeout" type="long">
-</parameter>
-<parameter name="unit" type="java.util.concurrent.TimeUnit">
-</parameter>
-<exception name="AuthenticatorException" type="android.accounts.AuthenticatorException">
-</exception>
-<exception name="IOException" type="java.io.IOException">
-</exception>
-<exception name="OperationCanceledException" type="android.accounts.OperationCanceledException">
-</exception>
-</method>
-</class>
-<class name="AccountManagerService"
- extends="android.accounts.IAccountManager.Stub"
- abstract="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<constructor name="AccountManagerService"
- type="android.accounts.AccountManagerService"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="context" type="android.content.Context">
-</parameter>
-</constructor>
-<method name="addAccount"
- return="boolean"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="account" type="android.accounts.Account">
-</parameter>
-<parameter name="password" type="java.lang.String">
-</parameter>
-<parameter name="extras" type="android.os.Bundle">
-</parameter>
-</method>
-<method name="addAcount"
- return="void"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="response" type="android.accounts.IAccountManagerResponse">
-</parameter>
-<parameter name="accountType" type="java.lang.String">
-</parameter>
-<parameter name="authTokenType" type="java.lang.String">
-</parameter>
-<parameter name="expectActivityLaunch" type="boolean">
-</parameter>
-<parameter name="options" type="android.os.Bundle">
-</parameter>
-</method>
-<method name="clearPassword"
- return="void"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="account" type="android.accounts.Account">
-</parameter>
-</method>
-<method name="confirmCredentials"
- return="void"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="response" type="android.accounts.IAccountManagerResponse">
-</parameter>
-<parameter name="account" type="android.accounts.Account">
-</parameter>
-<parameter name="expectActivityLaunch" type="boolean">
-</parameter>
-</method>
-<method name="confirmPassword"
- return="void"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="response" type="android.accounts.IAccountManagerResponse">
-</parameter>
-<parameter name="account" type="android.accounts.Account">
-</parameter>
-<parameter name="password" type="java.lang.String">
-</parameter>
-</method>
-<method name="editProperties"
- return="void"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="response" type="android.accounts.IAccountManagerResponse">
-</parameter>
-<parameter name="accountType" type="java.lang.String">
-</parameter>
-<parameter name="expectActivityLaunch" type="boolean">
-</parameter>
-</method>
-<method name="getAccounts"
- return="android.accounts.Account[]"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-</method>
-<method name="getAccountsByType"
- return="android.accounts.Account[]"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="accountType" type="java.lang.String">
-</parameter>
-</method>
-<method name="getAuthToken"
- return="void"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="response" type="android.accounts.IAccountManagerResponse">
-</parameter>
-<parameter name="account" type="android.accounts.Account">
-</parameter>
-<parameter name="authTokenType" type="java.lang.String">
-</parameter>
-<parameter name="notifyOnAuthFailure" type="boolean">
-</parameter>
-<parameter name="expectActivityLaunch" type="boolean">
-</parameter>
-<parameter name="loginOptions" type="android.os.Bundle">
-</parameter>
-</method>
-<method name="getAuthenticatorTypes"
- return="java.lang.String[]"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-</method>
-<method name="getPassword"
- return="java.lang.String"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="account" type="android.accounts.Account">
-</parameter>
-</method>
-<method name="getUserData"
- return="java.lang.String"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="account" type="android.accounts.Account">
-</parameter>
-<parameter name="key" type="java.lang.String">
-</parameter>
-</method>
-<method name="invalidateAuthToken"
- return="void"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="accountType" type="java.lang.String">
-</parameter>
-<parameter name="authToken" type="java.lang.String">
-</parameter>
-</method>
-<method name="onBind"
- return="android.os.IBinder"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="intent" type="android.content.Intent">
-</parameter>
-</method>
-<method name="peekAuthToken"
- return="java.lang.String"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="account" type="android.accounts.Account">
-</parameter>
-<parameter name="authTokenType" type="java.lang.String">
-</parameter>
-</method>
-<method name="readAuthTokenFromDatabase"
- return="java.lang.String"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="account" type="android.accounts.Account">
-</parameter>
-<parameter name="authTokenType" type="java.lang.String">
-</parameter>
-</method>
-<method name="removeAccount"
- return="void"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="account" type="android.accounts.Account">
-</parameter>
-</method>
-<method name="setAuthToken"
- return="void"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="account" type="android.accounts.Account">
-</parameter>
-<parameter name="authTokenType" type="java.lang.String">
-</parameter>
-<parameter name="authToken" type="java.lang.String">
-</parameter>
-</method>
-<method name="setPassword"
- return="void"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="account" type="android.accounts.Account">
-</parameter>
-<parameter name="password" type="java.lang.String">
-</parameter>
-</method>
-<method name="setUserData"
- return="void"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="account" type="android.accounts.Account">
-</parameter>
-<parameter name="key" type="java.lang.String">
-</parameter>
-<parameter name="value" type="java.lang.String">
-</parameter>
-</method>
-<method name="updateCredentials"
- return="void"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="response" type="android.accounts.IAccountManagerResponse">
-</parameter>
-<parameter name="account" type="android.accounts.Account">
-</parameter>
-<parameter name="authTokenType" type="java.lang.String">
-</parameter>
-<parameter name="expectActivityLaunch" type="boolean">
-</parameter>
-<parameter name="loginOptions" type="android.os.Bundle">
-</parameter>
-</method>
-<field name="mAuthTokenCache"
- type="java.util.HashMap"
- transient="false"
- volatile="false"
- static="false"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-</class>
-<class name="AccountManagerService.AuthTokenKey"
- extends="java.lang.Object"
- abstract="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<constructor name="AccountManagerService.AuthTokenKey"
- type="android.accounts.AccountManagerService.AuthTokenKey"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="account" type="android.accounts.Account">
-</parameter>
-<parameter name="authTokenType" type="java.lang.String">
-</parameter>
-</constructor>
-<field name="mAccount"
- type="android.accounts.Account"
- transient="false"
- volatile="false"
- static="false"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="mAuthTokenType"
- type="java.lang.String"
- transient="false"
- volatile="false"
- static="false"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-</class>
-<class name="AccountMonitor"
- extends="android.content.BroadcastReceiver"
- abstract="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<constructor name="AccountMonitor"
- type="android.accounts.AccountMonitor"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="context" type="android.content.Context">
-</parameter>
-<parameter name="listener" type="android.accounts.AccountMonitorListener">
-</parameter>
-</constructor>
-<method name="close"
- return="void"
- abstract="false"
- native="false"
- synchronized="true"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-</method>
-<method name="onReceive"
- return="void"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="context" type="android.content.Context">
-</parameter>
-<parameter name="intent" type="android.content.Intent">
-</parameter>
-</method>
-</class>
-<interface name="AccountMonitorListener"
- abstract="true"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<method name="onAccountsUpdated"
- return="void"
- abstract="true"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="currentAccounts" type="java.lang.String[]">
-</parameter>
-</method>
-</interface>
 <class name="AuthenticatorBindHelper"
  extends="java.lang.Object"
  abstract="false"
@@ -14388,6 +13887,36 @@
 </parameter>
 </constructor>
 </class>
+<class name="ChooseAccountActivity"
+ extends="android.app.ListActivity"
+ abstract="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<constructor name="ChooseAccountActivity"
+ type="android.accounts.ChooseAccountActivity"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</constructor>
+<method name="onCreate"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="savedInstanceState" type="android.os.Bundle">
+</parameter>
+</method>
+</class>
 <class name="Constants"
  extends="java.lang.Object"
  abstract="false"
@@ -14418,6 +13947,17 @@
  visibility="public"
 >
 </field>
+<field name="ACCOUNT_MANAGER_RESPONSE_KEY"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;accountManagerResponse&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="ACCOUNT_NAME_KEY"
  type="java.lang.String"
  transient="false"
@@ -14484,6 +14024,17 @@
  visibility="public"
 >
 </field>
+<field name="ERROR_CODE_BAD_ARGUMENTS"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="7"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="ERROR_CODE_CANCELED"
  type="int"
  transient="false"
@@ -14761,6 +14312,8 @@
 </parameter>
 <parameter name="authTokenType" type="java.lang.String">
 </parameter>
+<parameter name="requiredFeatures" type="java.lang.String[]">
+</parameter>
 <parameter name="options" type="android.os.Bundle">
 </parameter>
 <exception name="RemoteException" type="android.os.RemoteException">
@@ -14840,6 +14393,25 @@
 <exception name="RemoteException" type="android.os.RemoteException">
 </exception>
 </method>
+<method name="hasFeatures"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="response" type="android.accounts.IAccountAuthenticatorResponse">
+</parameter>
+<parameter name="account" type="android.accounts.Account">
+</parameter>
+<parameter name="features" type="java.lang.String[]">
+</parameter>
+<exception name="RemoteException" type="android.os.RemoteException">
+</exception>
+</method>
 <method name="updateCredentials"
  return="void"
  abstract="true"
@@ -15045,525 +14617,6 @@
 </exception>
 </method>
 </class>
-<interface name="IAccountManager"
- abstract="true"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<implements name="android.os.IInterface">
-</implements>
-<method name="addAccount"
- return="boolean"
- abstract="true"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="account" type="android.accounts.Account">
-</parameter>
-<parameter name="password" type="java.lang.String">
-</parameter>
-<parameter name="extras" type="android.os.Bundle">
-</parameter>
-<exception name="RemoteException" type="android.os.RemoteException">
-</exception>
-</method>
-<method name="addAcount"
- return="void"
- abstract="true"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="response" type="android.accounts.IAccountManagerResponse">
-</parameter>
-<parameter name="accountType" type="java.lang.String">
-</parameter>
-<parameter name="authTokenType" type="java.lang.String">
-</parameter>
-<parameter name="expectActivityLaunch" type="boolean">
-</parameter>
-<parameter name="options" type="android.os.Bundle">
-</parameter>
-<exception name="RemoteException" type="android.os.RemoteException">
-</exception>
-</method>
-<method name="clearPassword"
- return="void"
- abstract="true"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="account" type="android.accounts.Account">
-</parameter>
-<exception name="RemoteException" type="android.os.RemoteException">
-</exception>
-</method>
-<method name="confirmCredentials"
- return="void"
- abstract="true"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="response" type="android.accounts.IAccountManagerResponse">
-</parameter>
-<parameter name="account" type="android.accounts.Account">
-</parameter>
-<parameter name="expectActivityLaunch" type="boolean">
-</parameter>
-<exception name="RemoteException" type="android.os.RemoteException">
-</exception>
-</method>
-<method name="confirmPassword"
- return="void"
- abstract="true"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="response" type="android.accounts.IAccountManagerResponse">
-</parameter>
-<parameter name="account" type="android.accounts.Account">
-</parameter>
-<parameter name="password" type="java.lang.String">
-</parameter>
-<exception name="RemoteException" type="android.os.RemoteException">
-</exception>
-</method>
-<method name="editProperties"
- return="void"
- abstract="true"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="response" type="android.accounts.IAccountManagerResponse">
-</parameter>
-<parameter name="accountType" type="java.lang.String">
-</parameter>
-<parameter name="expectActivityLaunch" type="boolean">
-</parameter>
-<exception name="RemoteException" type="android.os.RemoteException">
-</exception>
-</method>
-<method name="getAccounts"
- return="android.accounts.Account[]"
- abstract="true"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<exception name="RemoteException" type="android.os.RemoteException">
-</exception>
-</method>
-<method name="getAccountsByType"
- return="android.accounts.Account[]"
- abstract="true"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="accountType" type="java.lang.String">
-</parameter>
-<exception name="RemoteException" type="android.os.RemoteException">
-</exception>
-</method>
-<method name="getAuthToken"
- return="void"
- abstract="true"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="response" type="android.accounts.IAccountManagerResponse">
-</parameter>
-<parameter name="account" type="android.accounts.Account">
-</parameter>
-<parameter name="authTokenType" type="java.lang.String">
-</parameter>
-<parameter name="notifyOnAuthFailure" type="boolean">
-</parameter>
-<parameter name="expectActivityLaunch" type="boolean">
-</parameter>
-<parameter name="options" type="android.os.Bundle">
-</parameter>
-<exception name="RemoteException" type="android.os.RemoteException">
-</exception>
-</method>
-<method name="getAuthenticatorTypes"
- return="java.lang.String[]"
- abstract="true"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<exception name="RemoteException" type="android.os.RemoteException">
-</exception>
-</method>
-<method name="getPassword"
- return="java.lang.String"
- abstract="true"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="account" type="android.accounts.Account">
-</parameter>
-<exception name="RemoteException" type="android.os.RemoteException">
-</exception>
-</method>
-<method name="getUserData"
- return="java.lang.String"
- abstract="true"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="account" type="android.accounts.Account">
-</parameter>
-<parameter name="key" type="java.lang.String">
-</parameter>
-<exception name="RemoteException" type="android.os.RemoteException">
-</exception>
-</method>
-<method name="invalidateAuthToken"
- return="void"
- abstract="true"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="accountType" type="java.lang.String">
-</parameter>
-<parameter name="authToken" type="java.lang.String">
-</parameter>
-<exception name="RemoteException" type="android.os.RemoteException">
-</exception>
-</method>
-<method name="peekAuthToken"
- return="java.lang.String"
- abstract="true"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="account" type="android.accounts.Account">
-</parameter>
-<parameter name="authTokenType" type="java.lang.String">
-</parameter>
-<exception name="RemoteException" type="android.os.RemoteException">
-</exception>
-</method>
-<method name="removeAccount"
- return="void"
- abstract="true"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="account" type="android.accounts.Account">
-</parameter>
-<exception name="RemoteException" type="android.os.RemoteException">
-</exception>
-</method>
-<method name="setAuthToken"
- return="void"
- abstract="true"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="account" type="android.accounts.Account">
-</parameter>
-<parameter name="authTokenType" type="java.lang.String">
-</parameter>
-<parameter name="authToken" type="java.lang.String">
-</parameter>
-<exception name="RemoteException" type="android.os.RemoteException">
-</exception>
-</method>
-<method name="setPassword"
- return="void"
- abstract="true"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="account" type="android.accounts.Account">
-</parameter>
-<parameter name="password" type="java.lang.String">
-</parameter>
-<exception name="RemoteException" type="android.os.RemoteException">
-</exception>
-</method>
-<method name="setUserData"
- return="void"
- abstract="true"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="account" type="android.accounts.Account">
-</parameter>
-<parameter name="key" type="java.lang.String">
-</parameter>
-<parameter name="value" type="java.lang.String">
-</parameter>
-<exception name="RemoteException" type="android.os.RemoteException">
-</exception>
-</method>
-<method name="updateCredentials"
- return="void"
- abstract="true"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="response" type="android.accounts.IAccountManagerResponse">
-</parameter>
-<parameter name="account" type="android.accounts.Account">
-</parameter>
-<parameter name="authTokenType" type="java.lang.String">
-</parameter>
-<parameter name="expectActivityLaunch" type="boolean">
-</parameter>
-<parameter name="options" type="android.os.Bundle">
-</parameter>
-<exception name="RemoteException" type="android.os.RemoteException">
-</exception>
-</method>
-</interface>
-<class name="IAccountManager.Stub"
- extends="android.os.Binder"
- abstract="true"
- static="true"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<implements name="android.accounts.IAccountManager">
-</implements>
-<constructor name="IAccountManager.Stub"
- type="android.accounts.IAccountManager.Stub"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-</constructor>
-<method name="asBinder"
- return="android.os.IBinder"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-</method>
-<method name="asInterface"
- return="android.accounts.IAccountManager"
- abstract="false"
- native="false"
- synchronized="false"
- static="true"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="obj" type="android.os.IBinder">
-</parameter>
-</method>
-<method name="onTransact"
- return="boolean"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="code" type="int">
-</parameter>
-<parameter name="data" type="android.os.Parcel">
-</parameter>
-<parameter name="reply" type="android.os.Parcel">
-</parameter>
-<parameter name="flags" type="int">
-</parameter>
-<exception name="RemoteException" type="android.os.RemoteException">
-</exception>
-</method>
-</class>
-<interface name="IAccountManagerResponse"
- abstract="true"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<implements name="android.os.IInterface">
-</implements>
-<method name="onError"
- return="void"
- abstract="true"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="errorCode" type="int">
-</parameter>
-<parameter name="errorMessage" type="java.lang.String">
-</parameter>
-<exception name="RemoteException" type="android.os.RemoteException">
-</exception>
-</method>
-<method name="onResult"
- return="void"
- abstract="true"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="value" type="android.os.Bundle">
-</parameter>
-<exception name="RemoteException" type="android.os.RemoteException">
-</exception>
-</method>
-</interface>
-<class name="IAccountManagerResponse.Stub"
- extends="android.os.Binder"
- abstract="true"
- static="true"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<implements name="android.accounts.IAccountManagerResponse">
-</implements>
-<constructor name="IAccountManagerResponse.Stub"
- type="android.accounts.IAccountManagerResponse.Stub"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-</constructor>
-<method name="asBinder"
- return="android.os.IBinder"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-</method>
-<method name="asInterface"
- return="android.accounts.IAccountManagerResponse"
- abstract="false"
- native="false"
- synchronized="false"
- static="true"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="obj" type="android.os.IBinder">
-</parameter>
-</method>
-<method name="onTransact"
- return="boolean"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="code" type="int">
-</parameter>
-<parameter name="data" type="android.os.Parcel">
-</parameter>
-<parameter name="reply" type="android.os.Parcel">
-</parameter>
-<parameter name="flags" type="int">
-</parameter>
-<exception name="RemoteException" type="android.os.RemoteException">
-</exception>
-</method>
-</class>
 <class name="NetworkErrorException"
  extends="java.lang.Exception"
  abstract="false"
@@ -15613,6 +14666,27 @@
 </parameter>
 </constructor>
 </class>
+<interface name="OnAccountsUpdatedListener"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<method name="onAccountsUpdated"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="accounts" type="android.accounts.Account[]">
+</parameter>
+</method>
+</interface>
 <class name="OperationCanceledException"
  extends="java.lang.Exception"
  abstract="false"
@@ -99921,6 +98995,17 @@
  visibility="public"
 >
 </field>
+<field name="GROUP_SYNC_ACCOUNT_TYPE"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;group_sync_account_type&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="GROUP_SYNC_ID"
  type="java.lang.String"
  transient="false"
@@ -101863,6 +100948,17 @@
  visibility="public"
 >
 </field>
+<field name="_SYNC_ACCOUNT_TYPE"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;_sync_account_type&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 </interface>
 <class name="LiveFolders"
  extends="java.lang.Object"
diff --git a/camera/libcameraservice/CameraService.cpp b/camera/libcameraservice/CameraService.cpp
index cb8ab58827c0..96ee5022415e 100644
--- a/camera/libcameraservice/CameraService.cpp
+++ b/camera/libcameraservice/CameraService.cpp
@@ -217,7 +217,13 @@ status_t CameraService::Client::unlock()
     // allow anyone to use camera
     LOGV("unlock (%p)", getCameraClient()->asBinder().get());
     status_t result = checkPid();
-    if (result == NO_ERROR) mClientPid = 0;
+    if (result == NO_ERROR) {
+        mClientPid = 0;
+
+        // we need to remove the reference so that when app goes
+        // away, the reference count goes to 0.
+        mCameraClient.clear();
+    }
     return result;
 }
 
@@ -894,8 +900,6 @@ status_t CameraService::Client::setParameters(const String8& params)
 // get preview/capture parameters - key/value pairs
 String8 CameraService::Client::getParameters() const
 {
-    LOGD("getParameters");
-
     Mutex::Autolock lock(mLock);
 
     if (mHardware == 0) {
@@ -903,7 +907,9 @@ String8 CameraService::Client::getParameters() const
         return String8();
     }
 
-    return mHardware->getParameters().flatten();
+    String8 params(mHardware->getParameters().flatten());
+    LOGD("getParameters(%s)", params.string());
+    return params;
 }
 
 void CameraService::Client::postAutoFocus(bool focused)
diff --git a/core/java/android/accounts/AbstractAccountAuthenticator.java b/core/java/android/accounts/AbstractAccountAuthenticator.java
index 587279a3696c..474755c64cb4 100644
--- a/core/java/android/accounts/AbstractAccountAuthenticator.java
+++ b/core/java/android/accounts/AbstractAccountAuthenticator.java
@@ -27,13 +27,13 @@ import android.os.RemoteException;
 public abstract class AbstractAccountAuthenticator {
     class Transport extends IAccountAuthenticator.Stub {
         public void addAccount(IAccountAuthenticatorResponse response, String accountType,
-                String authTokenType, Bundle options)
+                String authTokenType, String[] requiredFeatures, Bundle options)
                 throws RemoteException {
             final Bundle result;
             try {
                 result = AbstractAccountAuthenticator.this.addAccount(
                     new AccountAuthenticatorResponse(response),
-                        accountType, authTokenType, options);
+                        accountType, authTokenType, requiredFeatures, options);
             } catch (NetworkErrorException e) {
                 response.onError(Constants.ERROR_CODE_NETWORK_ERROR, e.getMessage());
                 return;
@@ -133,6 +133,25 @@ public abstract class AbstractAccountAuthenticator {
                 response.onResult(result);
             }
         }
+
+        public void hasFeatures(IAccountAuthenticatorResponse response,
+                Account account, String[] features) throws RemoteException {
+            final Bundle result;
+            try {
+                result = AbstractAccountAuthenticator.this.hasFeatures(
+                    new AccountAuthenticatorResponse(response), account, features);
+            } catch (UnsupportedOperationException e) {
+                response.onError(Constants.ERROR_CODE_UNSUPPORTED_OPERATION,
+                        "hasFeatures not supported");
+                return;
+            } catch (NetworkErrorException e) {
+                response.onError(Constants.ERROR_CODE_NETWORK_ERROR, e.getMessage());
+                return;
+            }
+            if (result != null) {
+                response.onResult(result);
+            }
+        }
     }
 
     Transport mTransport = new Transport();
@@ -160,7 +179,8 @@ public abstract class AbstractAccountAuthenticator {
     public abstract Bundle editProperties(AccountAuthenticatorResponse response,
             String accountType);
     public abstract Bundle addAccount(AccountAuthenticatorResponse response, String accountType,
-            String authTokenType, Bundle options) throws NetworkErrorException;
+            String authTokenType, String[] requiredFeatures, Bundle options)
+            throws NetworkErrorException;
     /* @deprecated */
     public abstract boolean confirmPassword(AccountAuthenticatorResponse response,
             Account account, String password) throws NetworkErrorException;
@@ -171,4 +191,6 @@ public abstract class AbstractAccountAuthenticator {
             throws NetworkErrorException;
     public abstract Bundle updateCredentials(AccountAuthenticatorResponse response,
             Account account, String authTokenType, Bundle loginOptions);
+    public abstract Bundle hasFeatures(AccountAuthenticatorResponse response,
+            Account account, String[] features) throws NetworkErrorException;
 }
diff --git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java
index c60f15da11a5..3d21101ef1ac 100644
--- a/core/java/android/accounts/AccountManager.java
+++ b/core/java/android/accounts/AccountManager.java
@@ -19,10 +19,15 @@ package android.accounts;
 import android.app.Activity;
 import android.content.Intent;
 import android.content.Context;
+import android.content.IntentFilter;
+import android.content.BroadcastReceiver;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.RemoteException;
+import android.os.Parcelable;
+import android.util.Config;
+import android.util.Log;
 
 import java.io.IOException;
 import java.util.concurrent.Callable;
@@ -31,9 +36,13 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.FutureTask;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.TimeUnit;
+import java.util.HashMap;
+import java.util.Map;
+
+import com.google.android.collect.Maps;
 
 /**
- * A class that helps with interactions with the {@link IAccountManager} interface. It provides
+ * A class that helps with interactions with the AccountManagerService. It provides
  * methods to allow for account, password, and authtoken management for all accounts on the
  * device. Some of these calls are implemented with the help of the corresponding
  * {@link IAccountAuthenticator} services. One accesses the {@link AccountManager} by calling:
@@ -47,10 +56,15 @@ public class AccountManager {
 
     private final Context mContext;
     private final IAccountManager mService;
+    private final Handler mMainHandler;
 
+    /**
+     * @hide
+     */
     public AccountManager(Context context, IAccountManager service) {
         mContext = context;
         mService = service;
+        mMainHandler = new Handler(mContext.getMainLooper());
     }
 
     public static AccountManager get(Context context) {
@@ -337,7 +351,7 @@ public class AccountManager {
                         false /* notifyOnAuthFailure */, true /* expectActivityLaunch */,
                         loginOptions);
             }
-        };
+        }.start();
     }
 
     public Future2 getAuthToken(
@@ -350,18 +364,19 @@ public class AccountManager {
                 mService.getAuthToken(mResponse, account, authTokenType,
                         notifyAuthFailure, false /* expectActivityLaunch */, null /* options */);
             }
-        };
+        }.start();
     }
 
     public Future2 addAccount(final String accountType,
-            final String authTokenType, final Bundle addAccountOptions,
+            final String authTokenType, final String[] requiredFeatures,
+            final Bundle addAccountOptions,
             final Activity activity, Future2Callback callback, Handler handler) {
         return new AmsTask(activity, handler, callback) {
             public void doWork() throws RemoteException {
                 mService.addAcount(mResponse, accountType, authTokenType,
-                        activity != null, addAccountOptions);
+                        requiredFeatures, activity != null, addAccountOptions);
             }
-        };
+        }.start();
     }
 
     /** @deprecated use {@link #confirmCredentials} instead */
@@ -374,6 +389,33 @@ public class AccountManager {
         };
     }
 
+    public Account[] blockingGetAccountsWithTypeAndFeatures(String type, String[] features)
+            throws AuthenticatorException, IOException, OperationCanceledException {
+        Future2 future = getAccountsWithTypeAndFeatures(type, features,
+                null /* callback */, null /* handler */);
+        Bundle result = future.getResult();
+        Parcelable[] accountsTemp = result.getParcelableArray(Constants.ACCOUNTS_KEY);
+        if (accountsTemp == null) {
+            throw new AuthenticatorException("accounts should not be null");
+        }
+        Account[] accounts = new Account[accountsTemp.length];
+        for (int i = 0; i < accountsTemp.length; i++) {
+            accounts[i] = (Account) accountsTemp[i];
+        }
+        return accounts;
+    }
+
+    public Future2 getAccountsWithTypeAndFeatures(
+            final String type, final String[] features,
+            Future2Callback callback, Handler handler) {
+        if (type == null) throw new IllegalArgumentException("type is null");
+        return new AmsTask(null /* activity */, handler, callback) {
+            public void doWork() throws RemoteException {
+                mService.getAccountsByTypeAndFeatures(mResponse, type, features);
+            }
+        }.start();
+    }
+
     public Future2 confirmCredentials(final Account account, final Activity activity,
             final Future2Callback callback,
             final Handler handler) {
@@ -381,7 +423,7 @@ public class AccountManager {
             public void doWork() throws RemoteException {
                 mService.confirmCredentials(mResponse, account, activity != null);
             }
-        };
+        }.start();
     }
 
     public Future2 updateCredentials(final Account account, final String authTokenType,
@@ -393,7 +435,7 @@ public class AccountManager {
                 mService.updateCredentials(mResponse, account, authTokenType, activity != null,
                         loginOptions);
             }
-        };
+        }.start();
     }
 
     public Future2 editProperties(final String accountType, final Activity activity,
@@ -403,7 +445,7 @@ public class AccountManager {
             public void doWork() throws RemoteException {
                 mService.editProperties(mResponse, accountType, activity != null);
             }
-        };
+        }.start();
     }
 
     private void ensureNotOnMainThread() {
@@ -422,24 +464,28 @@ public class AccountManager {
 
     private void postToHandler(Handler handler, final Future2Callback callback,
             final Future2 future) {
-        if (handler == null) {
-            handler = new Handler(mContext.getMainLooper());
-        }
-        final Handler innerHandler = handler;
-        innerHandler.post(new Runnable() {
+        handler = handler == null ? mMainHandler : handler;
+        handler.post(new Runnable() {
             public void run() {
                 callback.run(future);
             }
         });
     }
 
+    private void postToHandler(Handler handler, final OnAccountsUpdatedListener listener,
+            final Account[] accounts) {
+        handler = handler == null ? mMainHandler : handler;
+        handler.post(new Runnable() {
+            public void run() {
+                listener.onAccountsUpdated(accounts);
+            }
+        });
+    }
+
     private <V> void postToHandler(Handler handler, final Future1Callback<V> callback,
             final Future1<V> future) {
-        if (handler == null) {
-            handler = new Handler(mContext.getMainLooper());
-        }
-        final Handler innerHandler = handler;
-        innerHandler.post(new Runnable() {
+        handler = handler == null ? mMainHandler : handler;
+        handler.post(new Runnable() {
             public void run() {
                 callback.run(future);
             }
@@ -502,11 +548,12 @@ public class AccountManager {
         }
     }
 
-    public abstract class AmsTask extends FutureTask<Bundle> implements Future2 {
+    private abstract class AmsTask extends FutureTask<Bundle> implements Future2 {
         final IAccountManagerResponse mResponse;
         final Handler mHandler;
         final Future2Callback mCallback;
         final Activity mActivity;
+        final Thread mThread;
         public AmsTask(Activity activity, Handler handler, Future2Callback callback) {
             super(new Callable<Bundle>() {
                 public Bundle call() throws Exception {
@@ -518,8 +565,7 @@ public class AccountManager {
             mCallback = callback;
             mActivity = activity;
             mResponse = new Response();
-
-            new Thread(new Runnable() {
+            mThread = new Thread(new Runnable() {
                 public void run() {
                     try {
                         doWork();
@@ -527,7 +573,12 @@ public class AccountManager {
                         // never happens
                     }
                 }
-            }).start();
+            }, "AmsTask");
+        }
+
+        public final Future2 start() {
+            mThread.start();
+            return this;
         }
 
         public abstract void doWork() throws RemoteException;
@@ -609,7 +660,7 @@ public class AccountManager {
 
     }
 
-    public abstract class AMSTaskBoolean extends FutureTask<Boolean> implements Future1<Boolean> {
+    private abstract class AMSTaskBoolean extends FutureTask<Boolean> implements Future1<Boolean> {
         final IAccountManagerResponse response;
         final Handler mHandler;
         final Future1Callback<Boolean> mCallback;
@@ -716,13 +767,298 @@ public class AccountManager {
         }
 
         if (code == Constants.ERROR_CODE_UNSUPPORTED_OPERATION) {
-            return new UnsupportedOperationException();
+            return new UnsupportedOperationException(message);
         }
 
         if (code == Constants.ERROR_CODE_INVALID_RESPONSE) {
-            return new AuthenticatorException("invalid response");
+            return new AuthenticatorException(message);
+        }
+
+        if (code == Constants.ERROR_CODE_BAD_ARGUMENTS) {
+            return new IllegalArgumentException(message);
+        }
+
+        return new AuthenticatorException(message);
+    }
+
+    private class GetAuthTokenByTypeAndFeaturesTask extends AmsTask implements Future2Callback {
+        GetAuthTokenByTypeAndFeaturesTask(final String accountType, final String authTokenType,
+                final String[] features, Activity activityForPrompting,
+                final Bundle addAccountOptions, final Bundle loginOptions,
+                Future2Callback callback, Handler handler) {
+            super(activityForPrompting, handler, callback);
+            if (accountType == null) throw new IllegalArgumentException("account type is null");
+            mAccountType = accountType;
+            mAuthTokenType = authTokenType;
+            mFeatures = features;
+            mAddAccountOptions = addAccountOptions;
+            mLoginOptions = loginOptions;
+            mMyCallback = this;
         }
+        volatile Future2 mFuture = null;
+        final String mAccountType;
+        final String mAuthTokenType;
+        final String[] mFeatures;
+        final Bundle mAddAccountOptions;
+        final Bundle mLoginOptions;
+        final Future2Callback mMyCallback;
+
+        public void doWork() throws RemoteException {
+            getAccountsWithTypeAndFeatures(mAccountType, mFeatures, new Future2Callback() {
+                public void run(Future2 future) {
+                    Bundle getAccountsResult;
+                    try {
+                        getAccountsResult = future.getResult();
+                    } catch (OperationCanceledException e) {
+                        setException(e);
+                        return;
+                    } catch (IOException e) {
+                        setException(e);
+                        return;
+                    } catch (AuthenticatorException e) {
+                        setException(e);
+                        return;
+                    }
+
+                    Parcelable[] accounts =
+                            getAccountsResult.getParcelableArray(Constants.ACCOUNTS_KEY);
+                    if (accounts.length == 0) {
+                        if (mActivity != null) {
+                            // no accounts, add one now. pretend that the user directly
+                            // made this request
+                            mFuture = addAccount(mAccountType, mAuthTokenType, mFeatures,
+                                    mAddAccountOptions, mActivity, mMyCallback, mHandler);
+                        } else {
+                            // send result since we can't prompt to add an account
+                            Bundle result = new Bundle();
+                            result.putString(Constants.ACCOUNT_NAME_KEY, null);
+                            result.putString(Constants.ACCOUNT_TYPE_KEY, null);
+                            result.putString(Constants.AUTHTOKEN_KEY, null);
+                            try {
+                                mResponse.onResult(result);
+                            } catch (RemoteException e) {
+                                // this will never happen
+                            }
+                            // we are done
+                        }
+                    } else if (accounts.length == 1) {
+                        // have a single account, return an authtoken for it
+                        if (mActivity == null) {
+                            mFuture = getAuthToken((Account) accounts[0], mAuthTokenType,
+                                    false /* notifyAuthFailure */, mMyCallback, mHandler);
+                        } else {
+                            mFuture = getAuthToken((Account) accounts[0],
+                                    mAuthTokenType, mLoginOptions,
+                                    mActivity, mMyCallback, mHandler);
+                        }
+                    } else {
+                        if (mActivity != null) {
+                            IAccountManagerResponse chooseResponse =
+                                    new IAccountManagerResponse.Stub() {
+                                public void onResult(Bundle value) throws RemoteException {
+                                    Account account = new Account(
+                                            value.getString(Constants.ACCOUNT_NAME_KEY),
+                                            value.getString(Constants.ACCOUNT_TYPE_KEY));
+                                    mFuture = getAuthToken(account, mAuthTokenType, mLoginOptions,
+                                            mActivity, mMyCallback, mHandler);
+                                }
+
+                                public void onError(int errorCode, String errorMessage)
+                                        throws RemoteException {
+                                    mResponse.onError(errorCode, errorMessage);
+                                }
+                            };
+                            // have many accounts, launch the chooser
+                            Intent intent = new Intent();
+                            intent.setClassName("android",
+                                    "android.accounts.ChooseAccountActivity");
+                            intent.putExtra(Constants.ACCOUNTS_KEY, accounts);
+                            intent.putExtra(Constants.ACCOUNT_MANAGER_RESPONSE_KEY,
+                                    new AccountManagerResponse(chooseResponse));
+                            mActivity.startActivity(intent);
+                            // the result will arrive via the IAccountManagerResponse
+                        } else {
+                            // send result since we can't prompt to select an account
+                            Bundle result = new Bundle();
+                            result.putString(Constants.ACCOUNTS_KEY, null);
+                            try {
+                                mResponse.onResult(result);
+                            } catch (RemoteException e) {
+                                // this will never happen
+                            }
+                            // we are done
+                        }
+                    }
+                }}, mHandler);
+        }
+
 
-        return new AuthenticatorException("unknown error code");
+
+        // TODO(fredq) pass through the calls to our implemention of Future2 to the underlying
+        // future that we create. We need to do things like have cancel cancel the mFuture, if set
+        // or to cause this to be canceled if mFuture isn't set.
+        // Once this is done then getAuthTokenByFeatures can be changed to return a Future2.
+
+        public void run(Future2 future) {
+            try {
+                set(future.get());
+            } catch (InterruptedException e) {
+                cancel(true);
+            } catch (CancellationException e) {
+                cancel(true);
+            } catch (ExecutionException e) {
+                setException(e.getCause());
+            }
+        }
+    }
+
+    public void getAuthTokenByFeatures(
+            final String accountType, final String authTokenType, final String[] features,
+            final Activity activityForPrompting, final Bundle addAccountOptions,
+            final Bundle loginOptions,
+            final Future2Callback callback, final Handler handler) {
+        if (accountType == null) throw new IllegalArgumentException("account type is null");
+        if (authTokenType == null) throw new IllegalArgumentException("authTokenType is null");
+        new GetAuthTokenByTypeAndFeaturesTask(accountType, authTokenType,  features,
+                activityForPrompting, addAccountOptions, loginOptions, callback, handler).start();
+    }
+
+    private final HashMap<OnAccountsUpdatedListener, Handler> mAccountsUpdatedListeners =
+            Maps.newHashMap();
+
+    // These variable are only used from the LOGIN_ACCOUNTS_CHANGED_ACTION BroadcastReceiver
+    // and its getAccounts() callback which are both invoked only on the main thread. As a
+    // result we don't need to protect against concurrent accesses and any changes are guaranteed
+    // to be visible when used. Basically, these two variables are thread-confined.
+    private Future1<Account[]> mAccountsLookupFuture = null;
+    private boolean mAccountLookupPending = false;
+
+    /**
+     * BroadcastReceiver that listens for the LOGIN_ACCOUNTS_CHANGED_ACTION intent
+     * so that it can read the updated list of accounts and send them to the listener
+     * in mAccountsUpdatedListeners.
+     */
+    private final BroadcastReceiver mAccountsChangedBroadcastReceiver = new BroadcastReceiver() {
+        public void onReceive(final Context context, final Intent intent) {
+            if (mAccountsLookupFuture != null) {
+                // an accounts lookup is already in progress,
+                // don't bother starting another request
+                mAccountLookupPending = true;
+                return;
+            }
+            // initiate a read of the accounts
+            mAccountsLookupFuture = getAccounts(new Future1Callback<Account[]>() {
+                public void run(Future1<Account[]> future) {
+                    // clear the future so that future receives will try the lookup again
+                    mAccountsLookupFuture = null;
+
+                    // get the accounts array
+                    Account[] accounts;
+                    try {
+                        accounts = future.getResult();
+                    } catch (OperationCanceledException e) {
+                        // this should never happen, but if it does pretend we got another
+                        // accounts changed broadcast
+                        if (Config.LOGD) {
+                            Log.d(TAG, "the accounts lookup for listener notifications was "
+                                    + "canceled, try again by simulating the receipt of "
+                                    + "a LOGIN_ACCOUNTS_CHANGED_ACTION broadcast");
+                        }
+                        onReceive(context, intent);
+                        return;
+                    }
+
+                    // send the result to the listeners
+                    synchronized (mAccountsUpdatedListeners) {
+                        for (Map.Entry<OnAccountsUpdatedListener, Handler> entry :
+                                mAccountsUpdatedListeners.entrySet()) {
+                            Account[] accountsCopy = new Account[accounts.length];
+                            // send the listeners a copy to make sure that one doesn't
+                            // change what another sees
+                            System.arraycopy(accounts, 0, accountsCopy, 0, accountsCopy.length);
+                            postToHandler(entry.getValue(), entry.getKey(), accountsCopy);
+                        }
+                    }
+
+                    // If mAccountLookupPending was set when the account lookup finished it
+                    // means that we had previously ignored a LOGIN_ACCOUNTS_CHANGED_ACTION
+                    // intent because a lookup was already in progress. Now that we are done
+                    // with this lookup and notification pretend that another intent
+                    // was received by calling onReceive() directly.
+                    if (mAccountLookupPending) {
+                        mAccountLookupPending = false;
+                        onReceive(context, intent);
+                        return;
+                    }
+                }
+            }, mMainHandler);
+        }
+    };
+
+    /**
+     * Add a {@link OnAccountsUpdatedListener} to this instance of the {@link AccountManager}.
+     * The listener is guaranteed to be invoked on the thread of the Handler that is passed
+     * in or the main thread's Handler if handler is null.
+     * @param listener the listener to add
+     * @param handler the Handler whose thread will be used to invoke the listener. If null
+     * the AccountManager context's main thread will be used.
+     * @param updateImmediately if true then the listener will be invoked as a result of this
+     * call.
+     * @throws IllegalArgumentException if listener is null
+     * @throws IllegalStateException if listener was already added
+     */
+    public void addOnAccountsUpdatedListener(final OnAccountsUpdatedListener listener,
+            Handler handler, boolean updateImmediately) {
+        if (listener == null) {
+            throw new IllegalArgumentException("the listener is null");
+        }
+        synchronized (mAccountsUpdatedListeners) {
+            if (mAccountsUpdatedListeners.containsKey(listener)) {
+                throw new IllegalStateException("this listener is already added");
+            }
+            final boolean wasEmpty = mAccountsUpdatedListeners.isEmpty();
+
+            mAccountsUpdatedListeners.put(listener, handler);
+
+            if (wasEmpty) {
+                // Register a broadcast receiver to monitor account changes
+                IntentFilter intentFilter = new IntentFilter();
+                intentFilter.addAction(Constants.LOGIN_ACCOUNTS_CHANGED_ACTION);
+                mContext.registerReceiver(mAccountsChangedBroadcastReceiver, intentFilter);
+            }
+        }
+
+        if (updateImmediately) {
+            getAccounts(new Future1Callback<Account[]>() {
+                public void run(Future1<Account[]> future) {
+                    try {
+                        listener.onAccountsUpdated(future.getResult());
+                    } catch (OperationCanceledException e) {
+                        // ignore
+                    }
+                }
+            }, handler);
+        }
+    }
+
+    /**
+     * Remove an {@link OnAccountsUpdatedListener} that was previously registered with
+     * {@link #addOnAccountsUpdatedListener}.
+     * @param listener the listener to remove
+     * @throws IllegalArgumentException if listener is null
+     * @throws IllegalStateException if listener was not already added
+     */
+    public void removeOnAccountsUpdatedListener(OnAccountsUpdatedListener listener) {
+        if (listener == null) {
+            throw new IllegalArgumentException("the listener is null");
+        }
+        synchronized (mAccountsUpdatedListeners) {
+            if (mAccountsUpdatedListeners.remove(listener) == null) {
+                throw new IllegalStateException("this listener was not previously added");
+            }
+            if (mAccountsUpdatedListeners.isEmpty()) {
+                mContext.unregisterReceiver(mAccountsChangedBroadcastReceiver);
+            }
+        }
     }
 }
diff --git a/core/java/android/accounts/AccountManagerResponse.java b/core/java/android/accounts/AccountManagerResponse.java
new file mode 100644
index 000000000000..25371fd9cbb5
--- /dev/null
+++ b/core/java/android/accounts/AccountManagerResponse.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.accounts;
+
+import android.os.Bundle;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.os.RemoteException;
+
+/**
+ * Object that wraps calls to an {@link android.accounts.IAccountManagerResponse} object.
+ * @hide
+ */
+public class AccountManagerResponse implements Parcelable {
+    private IAccountManagerResponse mResponse;
+
+    public AccountManagerResponse(IAccountManagerResponse response) {
+        mResponse = response;
+    }
+
+    public AccountManagerResponse(Parcel parcel) {
+        mResponse =
+                IAccountManagerResponse.Stub.asInterface(parcel.readStrongBinder());
+    }
+
+    public void onResult(Bundle result) {
+        try {
+            mResponse.onResult(result);
+        } catch (RemoteException e) {
+            // this should never happen
+        }
+    }
+
+    public void onError(int errorCode, String errorMessage) {
+        try {
+            mResponse.onError(errorCode, errorMessage);
+        } catch (RemoteException e) {
+            // this should never happen
+        }
+    }
+
+    public int describeContents() {
+        return 0;
+    }
+
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeStrongBinder(mResponse.asBinder());
+    }
+
+    public static final Creator<AccountManagerResponse> CREATOR =
+            new Creator<AccountManagerResponse>() {
+        public AccountManagerResponse createFromParcel(Parcel source) {
+            return new AccountManagerResponse(source);
+        }
+
+        public AccountManagerResponse[] newArray(int size) {
+            return new AccountManagerResponse[size];
+        }
+    };
+}
\ No newline at end of file
diff --git a/core/java/android/accounts/AccountManagerService.java b/core/java/android/accounts/AccountManagerService.java
index 1f4362021fbf..ef0875c67055 100644
--- a/core/java/android/accounts/AccountManagerService.java
+++ b/core/java/android/accounts/AccountManagerService.java
@@ -59,6 +59,7 @@ import com.google.android.collect.Maps;
  * instead one uses an instance of {@link AccountManager}, which can be accessed as follows:
  *    AccountManager accountManager =
  *      (AccountManager)context.getSystemService(Context.ACCOUNT_SERVICE)
+ * @hide
  */
 public class AccountManagerService extends IAccountManager.Stub {
     private static final String TAG = "AccountManagerService";
@@ -79,7 +80,6 @@ public class AccountManagerService extends IAccountManager.Stub {
 
     private final AccountAuthenticatorCache mAuthenticatorCache;
     private final AuthenticatorBindHelper mBindHelper;
-    public final HashMap<AuthTokenKey, String> mAuthTokenCache = Maps.newHashMap();
     private final DatabaseHelper mOpenHelper;
     private final SimWatcher mSimWatcher;
 
@@ -300,7 +300,7 @@ public class AccountManagerService extends IAccountManager.Stub {
                     }
                 }
                 db.setTransactionSuccessful();
-                mContext.sendBroadcast(ACCOUNTS_CHANGED_INTENT);
+                sendAccountsChangedBroadcast();
                 return true;
             } finally {
                 db.endTransaction();
@@ -321,22 +321,10 @@ public class AccountManagerService extends IAccountManager.Stub {
     public void removeAccount(Account account) {
         long identityToken = clearCallingIdentity();
         try {
-            synchronized (mAuthTokenCache) {
-                ArrayList<AuthTokenKey> keysToRemove = Lists.newArrayList();
-                for (AuthTokenKey key : mAuthTokenCache.keySet()) {
-                    if (key.mAccount.equals(account)) {
-                        keysToRemove.add(key);
-                    }
-                }
-                for (AuthTokenKey key : keysToRemove) {
-                    mAuthTokenCache.remove(key);
-                }
-
-                final SQLiteDatabase db = mOpenHelper.getWritableDatabase();
-                db.delete(TABLE_ACCOUNTS, ACCOUNTS_NAME + "=? AND " + ACCOUNTS_TYPE+ "=?",
-                        new String[]{account.mName, account.mType});
-                mContext.sendBroadcast(ACCOUNTS_CHANGED_INTENT);
-            }
+            final SQLiteDatabase db = mOpenHelper.getWritableDatabase();
+            db.delete(TABLE_ACCOUNTS, ACCOUNTS_NAME + "=? AND " + ACCOUNTS_TYPE+ "=?",
+                    new String[]{account.mName, account.mType});
+            sendAccountsChangedBroadcast();
         } finally {
             restoreCallingIdentity(identityToken);
         }
@@ -359,31 +347,26 @@ public class AccountManagerService extends IAccountManager.Stub {
     }
 
     private void invalidateAuthToken(SQLiteDatabase db, String accountType, String authToken) {
-        synchronized (mAuthTokenCache) {
-            Cursor cursor = db.rawQuery(
-                    "SELECT " + TABLE_AUTHTOKENS + "." + AUTHTOKENS_ID
-                            + ", " + TABLE_ACCOUNTS + "." + ACCOUNTS_NAME
-                            + ", " + TABLE_AUTHTOKENS + "." + AUTHTOKENS_TYPE
-                            + " FROM " + TABLE_ACCOUNTS
-                            + " JOIN " + TABLE_AUTHTOKENS
-                            + " ON " + TABLE_ACCOUNTS + "." + ACCOUNTS_ID
-                            + " = " + AUTHTOKENS_ACCOUNTS_ID
-                            + " WHERE " + AUTHTOKENS_AUTHTOKEN + " = ? AND "
-                            + TABLE_ACCOUNTS + "." + ACCOUNTS_TYPE + " = ?",
-                    new String[]{authToken, accountType});
-            try {
-                while (cursor.moveToNext()) {
-                    long authTokenId = cursor.getLong(0);
-                    String accountName = cursor.getString(1);
-                    String authTokenType = cursor.getString(2);
-                    AuthTokenKey key = new AuthTokenKey(new Account(accountName, accountType),
-                            authTokenType);
-                    mAuthTokenCache.remove(key);
-                    db.delete(TABLE_AUTHTOKENS, AUTHTOKENS_ID + "=" + authTokenId, null);
-                }
-            } finally {
-                cursor.close();
+        Cursor cursor = db.rawQuery(
+                "SELECT " + TABLE_AUTHTOKENS + "." + AUTHTOKENS_ID
+                        + ", " + TABLE_ACCOUNTS + "." + ACCOUNTS_NAME
+                        + ", " + TABLE_AUTHTOKENS + "." + AUTHTOKENS_TYPE
+                        + " FROM " + TABLE_ACCOUNTS
+                        + " JOIN " + TABLE_AUTHTOKENS
+                        + " ON " + TABLE_ACCOUNTS + "." + ACCOUNTS_ID
+                        + " = " + AUTHTOKENS_ACCOUNTS_ID
+                        + " WHERE " + AUTHTOKENS_AUTHTOKEN + " = ? AND "
+                        + TABLE_ACCOUNTS + "." + ACCOUNTS_TYPE + " = ?",
+                new String[]{authToken, accountType});
+        try {
+            while (cursor.moveToNext()) {
+                long authTokenId = cursor.getLong(0);
+                String accountName = cursor.getString(1);
+                String authTokenType = cursor.getString(2);
+                db.delete(TABLE_AUTHTOKENS, AUTHTOKENS_ID + "=" + authTokenId, null);
             }
+        } finally {
+            cursor.close();
         }
     }
 
@@ -391,8 +374,18 @@ public class AccountManagerService extends IAccountManager.Stub {
         SQLiteDatabase db = mOpenHelper.getWritableDatabase();
         db.beginTransaction();
         try {
-            if (saveAuthTokenToDatabase(db, account, type, authToken)) {
-                mContext.sendBroadcast(ACCOUNTS_CHANGED_INTENT);
+            long accountId = getAccountId(db, account);
+            if (accountId < 0) {
+                return false;
+            }
+            db.delete(TABLE_AUTHTOKENS,
+                    AUTHTOKENS_ACCOUNTS_ID + "=" + accountId + " AND " + AUTHTOKENS_TYPE + "=?",
+                    new String[]{type});
+            ContentValues values = new ContentValues();
+            values.put(AUTHTOKENS_ACCOUNTS_ID, accountId);
+            values.put(AUTHTOKENS_TYPE, type);
+            values.put(AUTHTOKENS_AUTHTOKEN, authToken);
+            if (db.insert(TABLE_AUTHTOKENS, AUTHTOKENS_AUTHTOKEN, values) >= 0) {
                 db.setTransactionSuccessful();
                 return true;
             }
@@ -402,22 +395,6 @@ public class AccountManagerService extends IAccountManager.Stub {
         }
     }
 
-    private boolean saveAuthTokenToDatabase(SQLiteDatabase db, Account account, 
-            String type, String authToken) {
-        long accountId = getAccountId(db, account);
-        if (accountId < 0) {
-            return false;
-        }
-        db.delete(TABLE_AUTHTOKENS,
-                AUTHTOKENS_ACCOUNTS_ID + "=" + accountId + " AND " + AUTHTOKENS_TYPE + "=?",
-                new String[]{type});
-        ContentValues values = new ContentValues();
-        values.put(AUTHTOKENS_ACCOUNTS_ID, accountId);
-        values.put(AUTHTOKENS_TYPE, type);
-        values.put(AUTHTOKENS_AUTHTOKEN, authToken);
-        return db.insert(TABLE_AUTHTOKENS, AUTHTOKENS_AUTHTOKEN, values) >= 0;
-    }
-
     public String readAuthTokenFromDatabase(Account account, String authTokenType) {
         SQLiteDatabase db = mOpenHelper.getReadableDatabase();
         db.beginTransaction();
@@ -436,13 +413,7 @@ public class AccountManagerService extends IAccountManager.Stub {
     public String peekAuthToken(Account account, String authTokenType) {
         long identityToken = clearCallingIdentity();
         try {
-            synchronized (mAuthTokenCache) {
-                AuthTokenKey key = new AuthTokenKey(account, authTokenType);
-                if (mAuthTokenCache.containsKey(key)) {
-                    return mAuthTokenCache.get(key);
-                }
-                return readAuthTokenFromDatabase(account, authTokenType);
-            }
+            return readAuthTokenFromDatabase(account, authTokenType);
         } finally {
             restoreCallingIdentity(identityToken);
         }
@@ -465,12 +436,16 @@ public class AccountManagerService extends IAccountManager.Stub {
             mOpenHelper.getWritableDatabase().update(TABLE_ACCOUNTS, values,
                     ACCOUNTS_NAME + "=? AND " + ACCOUNTS_TYPE+ "=?",
                     new String[]{account.mName, account.mType});
-            mContext.sendBroadcast(ACCOUNTS_CHANGED_INTENT);
+            sendAccountsChangedBroadcast();
         } finally {
             restoreCallingIdentity(identityToken);
         }
     }
 
+    private void sendAccountsChangedBroadcast() {
+        mContext.sendBroadcast(ACCOUNTS_CHANGED_INTENT);
+    }
+
     public void clearPassword(Account account) {
         long identityToken = clearCallingIdentity();
         try {
@@ -518,7 +493,7 @@ public class AccountManagerService extends IAccountManager.Stub {
             final boolean expectActivityLaunch, final Bundle loginOptions) {
         long identityToken = clearCallingIdentity();
         try {
-            String authToken = getCachedAuthToken(account, authTokenType);
+            String authToken = readAuthTokenFromDatabase(account, authTokenType);
             if (authToken != null) {
                 try {
                     Bundle result = new Bundle();
@@ -578,19 +553,24 @@ public class AccountManagerService extends IAccountManager.Stub {
     }
 
 
-    public void addAcount(final IAccountManagerResponse response,
-            final String accountType, final String authTokenType,
+    public void addAcount(final IAccountManagerResponse response, final String accountType,
+            final String authTokenType, final String[] requiredFeatures,
             final boolean expectActivityLaunch, final Bundle options) {
         long identityToken = clearCallingIdentity();
         try {
             new Session(response, accountType, expectActivityLaunch) {
                 public void run() throws RemoteException {
-                    mAuthenticator.addAccount(this, mAccountType, authTokenType, options);
+                    mAuthenticator.addAccount(this, mAccountType, authTokenType, requiredFeatures, 
+                            options);
                 }
 
                 protected String toDebugString(long now) {
                     return super.toDebugString(now) + ", addAccount"
-                            + ", accountType " + accountType;
+                            + ", accountType " + accountType
+                            + ", requiredFeatures "
+                            + (requiredFeatures != null
+                              ? TextUtils.join(",", requiredFeatures)
+                              : null);
                 }
             }.bind();
         } finally {
@@ -674,24 +654,101 @@ public class AccountManagerService extends IAccountManager.Stub {
         }
     }
 
-    private boolean cacheAuthToken(Account account, String authTokenType, String authToken) {
-        synchronized (mAuthTokenCache) {
-            if (saveAuthTokenToDatabase(account, authTokenType, authToken)) {
-                final AuthTokenKey key = new AuthTokenKey(account, authTokenType);
-                mAuthTokenCache.put(key, authToken);
-                return true;
-            } else {
-                return false;
+    private class GetAccountsByTypeAndFeatureSession extends Session {
+        private final String[] mFeatures;
+        private volatile Account[] mAccountsOfType = null;
+        private volatile ArrayList<Account> mAccountsWithFeatures = null;
+        private volatile int mCurrentAccount = 0;
+
+        public GetAccountsByTypeAndFeatureSession(IAccountManagerResponse response,
+            String type, String[] features) {
+            super(response, type, false /* expectActivityLaunch */);
+            mFeatures = features;
+        }
+
+        public void run() throws RemoteException {
+            mAccountsOfType = getAccountsByType(mAccountType);
+            // check whether each account matches the requested features
+            mAccountsWithFeatures = new ArrayList<Account>(mAccountsOfType.length);
+            mCurrentAccount = 0;
+
+            checkAccount();
+        }
+
+        public void checkAccount() {
+            if (mCurrentAccount >= mAccountsOfType.length) {
+                sendResult();
+                return;
+            }
+
+            try {
+                mAuthenticator.hasFeatures(this, mAccountsOfType[mCurrentAccount], mFeatures);
+            } catch (RemoteException e) {
+                onError(Constants.ERROR_CODE_REMOTE_EXCEPTION, "remote exception");
             }
         }
-    }
 
-    private String getCachedAuthToken(Account account, String authTokenType) {
-        synchronized (mAuthTokenCache) {
-            final AuthTokenKey key = new AuthTokenKey(account, authTokenType);
-            if (!mAuthTokenCache.containsKey(key)) return null;
-            return mAuthTokenCache.get(key);
+        public void onResult(Bundle result) {
+            mNumResults++;
+            if (result == null) {
+                onError(Constants.ERROR_CODE_INVALID_RESPONSE, "null bundle");
+                return;
+            }
+            if (result.getBoolean(Constants.BOOLEAN_RESULT_KEY, false)) {
+                mAccountsWithFeatures.add(mAccountsOfType[mCurrentAccount]);
+            }
+            mCurrentAccount++;
+            checkAccount();
         }
+
+        public void sendResult() {
+            IAccountManagerResponse response = getResponseAndClose();
+            if (response != null) {
+                try {
+                    Account[] accounts = new Account[mAccountsWithFeatures.size()];
+                    for (int i = 0; i < accounts.length; i++) {
+                        accounts[i] = mAccountsWithFeatures.get(i);
+                    }
+                    Bundle result = new Bundle();
+                    result.putParcelableArray(Constants.ACCOUNTS_KEY, accounts);
+                    response.onResult(result);
+                } catch (RemoteException e) {
+                    // if the caller is dead then there is no one to care about remote exceptions
+                    if (Log.isLoggable(TAG, Log.VERBOSE)) {
+                        Log.v(TAG, "failure while notifying response", e);
+                    }
+                }
+            }
+        }
+
+
+        protected String toDebugString(long now) {
+            return super.toDebugString(now) + ", getAccountsByTypeAndFeatures"
+                    + ", " + (mFeatures != null ? TextUtils.join(",", mFeatures) : null);
+        }
+    }
+    public void getAccountsByTypeAndFeatures(IAccountManagerResponse response,
+            String type, String[] features) {
+        if (type == null) {
+            if (response != null) {
+                try {
+                    response.onError(Constants.ERROR_CODE_BAD_ARGUMENTS, "type is null");
+                } catch (RemoteException e) {
+                    // ignore this
+                }
+            }
+            return;
+        }
+        long identityToken = clearCallingIdentity();
+        try {
+            new GetAccountsByTypeAndFeatureSession(response, type, features).bind();
+        } finally {
+            restoreCallingIdentity(identityToken);
+        }
+    }
+
+    private boolean cacheAuthToken(Account account, String authTokenType, String authToken) {
+        return saveAuthTokenToDatabase(account, authTokenType, authToken);
     }
 
     private long getAccountId(SQLiteDatabase db, Account account) {
@@ -743,7 +800,7 @@ public class AccountManagerService extends IAccountManager.Stub {
         final boolean mExpectActivityLaunch;
         final long mCreationTime;
 
-        private int mNumResults = 0;
+        public int mNumResults = 0;
         private int mNumRequestContinued = 0;
         private int mNumErrors = 0;
 
@@ -754,6 +811,7 @@ public class AccountManagerService extends IAccountManager.Stub {
                 boolean expectActivityLaunch) {
             super();
             if (response == null) throw new IllegalArgumentException("response is null");
+            if (accountType == null) throw new IllegalArgumentException("accountType is null");
             mResponse = response;
             mAccountType = accountType;
             mExpectActivityLaunch = expectActivityLaunch;
@@ -1071,7 +1129,7 @@ public class AccountManagerService extends IAccountManager.Stub {
                 try {
                     db.execSQL("DELETE from " + TABLE_AUTHTOKENS);
                     db.execSQL("UPDATE " + TABLE_ACCOUNTS + " SET " + ACCOUNTS_PASSWORD + " = ''");
-                    mContext.sendBroadcast(ACCOUNTS_CHANGED_INTENT);
+                    sendAccountsChangedBroadcast();
                     db.setTransactionSuccessful();
                 } finally {
                     db.endTransaction();
diff --git a/core/java/android/accounts/AccountMonitor.java b/core/java/android/accounts/AccountMonitor.java
deleted file mode 100644
index 38032c59ba66..000000000000
--- a/core/java/android/accounts/AccountMonitor.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.accounts;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.os.*;
-
-/**
- * A helper class that calls back on the provided
- * AccountMonitorListener with the set of current accounts both when
- * it gets created and whenever the set changes. It does this by
- * binding to the AccountsService and registering to receive the
- * intent broadcast when the set of accounts is changed.  The
- * connection to the accounts service is only made when it needs to
- * fetch the current list of accounts (that is, when the
- * AccountMonitor is first created, and when the intent is received).
- */
-public class AccountMonitor extends BroadcastReceiver {
-    private static final String TAG = "AccountMonitor";
-
-    private final Context mContext;
-    private final AccountMonitorListener mListener;
-    private boolean mClosed = false;
-
-    private volatile Looper mServiceLooper;
-    private volatile NotifierHandler mServiceHandler;
-
-    /**
-     * Initializes the AccountMonitor and initiates a bind to the
-     * AccountsService to get the initial account list.  For 1.0,
-     * the "list" is always a single account.
-     *
-     * @param context the context we are running in
-     * @param listener the user to notify when the account set changes
-     */
-    public AccountMonitor(Context context, AccountMonitorListener listener) {
-        if (listener == null) {
-            throw new IllegalArgumentException("listener is null");
-        }
-
-        mContext = context;
-        mListener = listener;
-
-        // Register a broadcast receiver to monitor account changes
-        IntentFilter intentFilter = new IntentFilter();
-        intentFilter.addAction(Constants.LOGIN_ACCOUNTS_CHANGED_ACTION);
-        intentFilter.addAction(Intent.ACTION_DEVICE_STORAGE_OK);  // To recover from disk-full.
-        mContext.registerReceiver(this, intentFilter);
-
-        HandlerThread thread = new HandlerThread("AccountMonitorHandlerThread");
-        thread.start();
-        mServiceLooper = thread.getLooper();
-        mServiceHandler = new NotifierHandler(mServiceLooper);
-
-        mServiceHandler.sendEmptyMessage(0);
-    }
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        notifyListener();
-    }
-
-    private Future1Callback<Account[]> mGetAccountsCallback = new Future1Callback<Account[]>() {
-        public void run(Future1<Account[]> future) {
-            try {
-                Account[] accounts = future.getResult();
-                String[] accountNames = new String[accounts.length];
-                for (int i = 0; i < accounts.length; i++) {
-                    accountNames[i] = accounts[i].mName;
-                }
-                mListener.onAccountsUpdated(accountNames);
-            } catch (OperationCanceledException e) {
-                // the request was canceled
-            }
-        }
-    };
-
-    private synchronized void notifyListener() {
-        AccountManager.get(mContext).getAccounts(mGetAccountsCallback, null /* handler */);
-    }
-
-    /**
-     * Unregisters the account receiver.  Consecutive calls to this
-     * method are harmless, but also do nothing.  Once this call is
-     * made no more notifications will occur.
-     */
-    public synchronized void close() {
-        if (!mClosed) {
-            mContext.unregisterReceiver(this);
-            mClosed = true;
-        }
-    }
-
-    private final class NotifierHandler extends Handler {
-        public NotifierHandler(Looper looper) {
-            super(looper);
-        }
-
-        public void handleMessage(Message msg) {
-            notifyListener();
-        }
-    }
-}
diff --git a/core/java/android/accounts/ChooseAccountActivity.java b/core/java/android/accounts/ChooseAccountActivity.java
new file mode 100644
index 000000000000..83377f352f0b
--- /dev/null
+++ b/core/java/android/accounts/ChooseAccountActivity.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package android.accounts;
+
+import android.app.ListActivity;
+import android.os.Bundle;
+import android.os.Parcelable;
+import android.widget.ArrayAdapter;
+import android.widget.ListView;
+import android.view.View;
+import android.util.Log;
+
+public class ChooseAccountActivity extends ListActivity {
+    private static final String TAG = "AccountManager";
+    private Parcelable[] mAccounts = null;
+    private AccountManagerResponse mAccountManagerResponse = null;
+    private Bundle mResult;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        if (savedInstanceState == null) {
+            mAccounts = getIntent().getParcelableArrayExtra(Constants.ACCOUNTS_KEY);
+            mAccountManagerResponse =
+                    getIntent().getParcelableExtra(Constants.ACCOUNT_MANAGER_RESPONSE_KEY);
+        } else {
+            mAccounts = savedInstanceState.getParcelableArray(Constants.ACCOUNTS_KEY);
+            mAccountManagerResponse =
+                    savedInstanceState.getParcelable(Constants.ACCOUNT_MANAGER_RESPONSE_KEY);
+        }
+
+        String[] mAccountNames = new String[mAccounts.length];
+        for (int i = 0; i < mAccounts.length; i++) {
+            mAccountNames[i] = ((Account) mAccounts[i]).mName;
+        }
+
+        // Use an existing ListAdapter that will map an array
+        // of strings to TextViews
+        setListAdapter(new ArrayAdapter<String>(this,
+                android.R.layout.simple_list_item_1, mAccountNames));
+        getListView().setTextFilterEnabled(true);
+    }
+
+    protected void onListItemClick(ListView l, View v, int position, long id) {
+        Account account = (Account) mAccounts[position];
+        Log.d(TAG, "selected account " + account);
+        Bundle bundle = new Bundle();
+        bundle.putString(Constants.ACCOUNT_NAME_KEY, account.mName);
+        bundle.putString(Constants.ACCOUNT_TYPE_KEY, account.mType);
+        mResult = bundle;
+        finish();
+    }
+
+    public void finish() {
+        if (mAccountManagerResponse != null) {
+            if (mResult != null) {
+                mAccountManagerResponse.onResult(mResult);
+            } else {
+                mAccountManagerResponse.onError(Constants.ERROR_CODE_CANCELED, "canceled");
+            }
+        }
+        super.finish();
+    }
+}
diff --git a/core/java/android/accounts/Constants.java b/core/java/android/accounts/Constants.java
index d3b6aa0f0b5c..b383c6182473 100644
--- a/core/java/android/accounts/Constants.java
+++ b/core/java/android/accounts/Constants.java
@@ -24,6 +24,7 @@ public class Constants {
     public static final int ERROR_CODE_CANCELED = 4;
     public static final int ERROR_CODE_INVALID_RESPONSE = 5;
     public static final int ERROR_CODE_UNSUPPORTED_OPERATION = 6;
+    public static final int ERROR_CODE_BAD_ARGUMENTS = 7;
 
     public static final String ACCOUNTS_KEY = "accounts";
     public static final String AUTHENTICATOR_TYPES_KEY = "authenticator_types";
@@ -37,6 +38,7 @@ public class Constants {
     public static final String INTENT_KEY = "intent";
     public static final String BOOLEAN_RESULT_KEY = "booleanResult";
     public static final String ACCOUNT_AUTHENTICATOR_RESPONSE_KEY = "accountAuthenticatorResponse";
+    public static final String ACCOUNT_MANAGER_RESPONSE_KEY = "accountManagerResponse";
     public static final String AUTH_FAILED_MESSAGE_KEY = "authFailedMessage";
     /**
      * Action sent as a broadcast Intent by the AccountsService
diff --git a/core/java/android/accounts/IAccountAuthenticator.aidl b/core/java/android/accounts/IAccountAuthenticator.aidl
index 70c075208cb7..46a714468fb5 100644
--- a/core/java/android/accounts/IAccountAuthenticator.aidl
+++ b/core/java/android/accounts/IAccountAuthenticator.aidl
@@ -28,7 +28,7 @@ oneway interface IAccountAuthenticator {
      * prompts the user for account information and adds the result to the IAccountManager
      */
     void addAccount(in IAccountAuthenticatorResponse response, String accountType,
-        String authTokenType, in Bundle options);
+        String authTokenType, in String[] requiredFeatures, in Bundle options);
 
     /**
      * Checks that the account/password combination is valid.
@@ -58,4 +58,11 @@ oneway interface IAccountAuthenticator {
      * launches an activity that lets the user edit and set the properties for an authenticator
      */
     void editProperties(in IAccountAuthenticatorResponse response, String accountType);
+
+    /**
+     * returns a Bundle where the boolean value BOOLEAN_RESULT_KEY is set if the account has the
+     * specified features
+     */
+    void hasFeatures(in IAccountAuthenticatorResponse response, in Account account, 
+        in String[] features);
 }
diff --git a/core/java/android/accounts/IAccountManager.aidl b/core/java/android/accounts/IAccountManager.aidl
index 365a92a05cbb..5e37a1fd46c2 100644
--- a/core/java/android/accounts/IAccountManager.aidl
+++ b/core/java/android/accounts/IAccountManager.aidl
@@ -22,6 +22,7 @@ import android.os.Bundle;
 
 /**
  * Central application service that provides account management.
+ * @hide
  */
 interface IAccountManager {
     String getPassword(in Account account);
@@ -42,16 +43,19 @@ interface IAccountManager {
         String authTokenType, boolean notifyOnAuthFailure, boolean expectActivityLaunch,
         in Bundle options);
     void addAcount(in IAccountManagerResponse response, String accountType,
-        String authTokenType, boolean expectActivityLaunch, in Bundle options);
+        String authTokenType, in String[] requiredFeatures, boolean expectActivityLaunch, 
+        in Bundle options);
     void updateCredentials(in IAccountManagerResponse response, in Account account,
         String authTokenType, boolean expectActivityLaunch, in Bundle options);
     void editProperties(in IAccountManagerResponse response, String accountType,
         boolean expectActivityLaunch);
     void confirmCredentials(in IAccountManagerResponse response, in Account account,
         boolean expectActivityLaunch);
+    void getAccountsByTypeAndFeatures(in IAccountManagerResponse response, String accountType,
+        in String[] features);
 
     /*
-     * @Deprecated
+     * @deprecated
      */
     void confirmPassword(in IAccountManagerResponse response, in Account account,
         String password);
diff --git a/core/java/android/accounts/IAccountManagerResponse.aidl b/core/java/android/accounts/IAccountManagerResponse.aidl
index 52f21bc6b322..ca1203d1a058 100644
--- a/core/java/android/accounts/IAccountManagerResponse.aidl
+++ b/core/java/android/accounts/IAccountManagerResponse.aidl
@@ -19,6 +19,7 @@ import android.os.Bundle;
 
 /**
  * The interface used to return responses for asynchronous calls to the {@link IAccountManager}
+ * @hide
  */
 oneway interface IAccountManagerResponse {
     void onResult(in Bundle value);
diff --git a/core/java/android/accounts/AccountMonitorListener.java b/core/java/android/accounts/OnAccountsUpdatedListener.java
index d0bd9a93f3eb..bd249d0a3f9e 100644
--- a/core/java/android/accounts/AccountMonitorListener.java
+++ b/core/java/android/accounts/OnAccountsUpdatedListener.java
@@ -19,11 +19,11 @@ package android.accounts;
 /**
  * An interface that contains the callback used by the AccountMonitor
  */
-public interface AccountMonitorListener {
+public interface OnAccountsUpdatedListener {
     /**
      * This invoked when the AccountMonitor starts up and whenever the account
      * set changes.
-     * @param currentAccounts the current accounts
+     * @param accounts the current accounts
      */
-    void onAccountsUpdated(String[] currentAccounts);
+    void onAccountsUpdated(Account[] accounts);
 }
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index 849a37dc95a9..9b1f0f97171f 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -611,7 +611,7 @@ public class Activity extends ContextThemeWrapper
     private IBinder mToken;
     /*package*/ String mEmbeddedID;
     private Application mApplication;
-    private Intent mIntent;
+    /*package*/ Intent mIntent;
     private ComponentName mComponent;
     /*package*/ ActivityInfo mActivityInfo;
     /*package*/ ActivityThread mMainThread;
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index d8161936a44d..09862d2705d1 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -1689,7 +1689,7 @@ public final class ActivityThread {
 
                     r.packageInfo = getPackageInfoNoCheck(
                             r.activityInfo.applicationInfo);
-                    handleLaunchActivity(r);
+                    handleLaunchActivity(r, null);
                 } break;
                 case RELAUNCH_ACTIVITY: {
                     ActivityRecord r = (ActivityRecord)msg.obj;
@@ -2109,7 +2109,7 @@ public final class ActivityThread {
                     + ", comp=" + name
                     + ", token=" + token);
         }
-        return performLaunchActivity(r);
+        return performLaunchActivity(r, null);
     }
 
     public final Activity getActivity(IBinder token) {
@@ -2159,7 +2159,7 @@ public final class ActivityThread {
         queueOrSendMessage(H.CLEAN_UP_CONTEXT, cci);
     }
 
-    private final Activity performLaunchActivity(ActivityRecord r) {
+    private final Activity performLaunchActivity(ActivityRecord r, Intent customIntent) {
         // System.out.println("##### [" + System.currentTimeMillis() + "] ActivityThread.performLaunchActivity(" + r + ")");
 
         ActivityInfo aInfo = r.activityInfo;
@@ -2219,6 +2219,9 @@ public final class ActivityThread {
                         r.lastNonConfigurationInstance, r.lastNonConfigurationChildInstances,
                         config);
                 
+                if (customIntent != null) {
+                    activity.mIntent = customIntent;
+                }
                 r.lastNonConfigurationInstance = null;
                 r.lastNonConfigurationChildInstances = null;
                 activity.mStartedActivity = false;
@@ -2274,14 +2277,14 @@ public final class ActivityThread {
         return activity;
     }
 
-    private final void handleLaunchActivity(ActivityRecord r) {
+    private final void handleLaunchActivity(ActivityRecord r, Intent customIntent) {
         // If we are getting ready to gc after going to the background, well
         // we are back active so skip it.
         unscheduleGcIdler();
 
         if (localLOGV) Log.v(
             TAG, "Handling launch of " + r);
-        Activity a = performLaunchActivity(r);
+        Activity a = performLaunchActivity(r, customIntent);
 
         if (a != null) {
             handleResumeActivity(r.token, false, r.isForward);
@@ -3243,6 +3246,7 @@ public final class ActivityThread {
         }
         
         r.activity.mConfigChangeFlags |= configChanges;
+        Intent currentIntent = r.activity.mIntent;
         
         Bundle savedState = null;
         if (!r.paused) {
@@ -3275,7 +3279,7 @@ public final class ActivityThread {
             r.state = savedState;
         }
         
-        handleLaunchActivity(r);
+        handleLaunchActivity(r, currentIntent);
     }
 
     private final void handleRequestThumbnail(IBinder token) {
diff --git a/core/java/android/app/SearchManager.java b/core/java/android/app/SearchManager.java
index c1d66f4e7d7b..ecdd3f8cb579 100644
--- a/core/java/android/app/SearchManager.java
+++ b/core/java/android/app/SearchManager.java
@@ -807,7 +807,7 @@ import android.view.KeyEvent;
  * this way would be if you wish to partition it into separate sections with different search 
  * behaviors;  Otherwise this configuration is not recommended.
  * 
- * <p><b>Additional Metadata for search suggestions.</b>  If you have defined a content provider
+ * <p><b>Additional metadata for search suggestions.</b>  If you have defined a content provider
  * to generate search suggestions, you'll need to publish it to the system, and you'll need to 
  * provide a bit of additional XML metadata in order to configure communications with it.
  * 
@@ -880,7 +880,7 @@ import android.view.KeyEvent;
  *     </tbody>
  * </table>
  * 
- * <p><b>Additional Metadata for search action keys.</b>  For each action key that you would like to
+ * <p><b>Additional metadata for search action keys.</b>  For each action key that you would like to
  * define, you'll need to add an additional element defining that key, and using the attributes
  * discussed in <a href="#ActionKeys">Action Keys</a>.  A simple example is shown here:
  * 
@@ -956,6 +956,84 @@ import android.view.KeyEvent;
  *     </tbody>
  * </table>
  * 
+ * <p><b>Additional metadata for enabling voice search.</b>  To enable voice search for your
+ * activity, you can add fields to the metadata that enable and configure voice search.  When
+ * enabled (and available on the device), a voice search button will be displayed in the
+ * Search UI.  Clicking this button will launch a voice search activity.  When the user has
+ * finished speaking, the voice search phrase will be transcribed into text and presented to the
+ * searchable activity as if it were a typed query.
+ * 
+ * <p>Elements of search metadata that support voice search:
+ * <table border="2" width="85%" align="center" frame="hsides" rules="rows">
+ *
+ *     <thead>
+ *     <tr><th>Attribute</th> <th>Description</th> <th>Required?</th></tr>
+ *     </thead>
+ *     
+ *     <tr><th>android:voiceSearchMode</th>
+ *         <td>If provided and non-zero, enables voice search.  (Voice search may not be
+ *             provided by the device, in which case these flags will have no effect.)  The
+ *             following mode bits are defined:
+ *             <table border="2" align="center" frame="hsides" rules="rows">
+ *                 <tbody>
+ *                 <tr><th>showVoiceSearchButton</th>
+ *                     <td>If set, display a voice search button.  This only takes effect if voice
+ *                         search is available on the device.  If set, then launchWebSearch or
+ *                         launchRecognizer must also be set.</td>
+ *                 </tr>
+ *                 <tr><th>launchWebSearch</th>
+ *                     <td>If set, the voice search button will take the user directly to a 
+ *                         built-in voice web search activity.  Most applications will not use this
+ *                         flag, as it will take the user away from the activity in which search
+ *                         was invoked.</td>
+ *                 </tr>
+ *                 <tr><th>launchRecognizer</th>
+ *                     <td>If set, the voice search button will take the user directly to a
+ *                         built-in voice recording activity.  This activity will prompt the user
+ *                         to speak, transcribe the spoken text, and forward the resulting query
+ *                         text to the searchable activity, just as if the user had typed it into
+ *                         the search UI and clicked the search button.</td>
+ *                 </tr>
+ *                 </tbody>
+ *            </table></td>
+ *         <td align="center">No</td>
+ *     </tr>
+ *     
+ *     <tr><th>android:voiceLanguageModel</th>
+ *         <td>If provided, this specifies the language model that should be used by the voice
+ *             recognition system.  
+ *             See {@link android.speech.RecognizerIntent#EXTRA_LANGUAGE_MODEL}
+ *             for more information.  If not provided, the default value
+ *             {@link android.speech.RecognizerIntent#LANGUAGE_MODEL_FREE_FORM} will be used.</td>
+ *         <td align="center">No</td>
+ *     </tr>
+ *     
+ *     <tr><th>android:voicePromptText</th>
+ *         <td>If provided, this specifies a prompt that will be displayed during voice input.
+ *             (If not provided, a default prompt will be displayed.)</td>
+ *         <td align="center">No</td>
+ *     </tr>
+ *     
+ *     <tr><th>android:voiceLanguage</th>
+ *         <td>If provided, this specifies the spoken language to be expected.  This is only
+ *             needed if it is different from the current value of
+ *             {@link java.util.Locale#getDefault()}.
+ *             </td>
+ *         <td align="center">No</td>
+ *     </tr>
+ *     
+ *     <tr><th>android:voiceMaxResults</th>
+ *         <td>If provided, enforces the maximum number of results to return, including the "best"
+ *             result which will always be provided as the SEARCH intent's primary query.  Must be
+ *             one or greater.  Use {@link android.speech.RecognizerIntent#EXTRA_RESULTS} 
+ *             to get the results from the intent.  If not provided, the recognizer will choose
+ *             how many results to return.</td>
+ *         <td align="center">No</td>
+ *     </tr>
+ * 
+ *     </tbody>
+ * </table>
+ * 
  * <a name="PassingSearchContext"></a>
  * <h3>Passing Search Context</h3>
  * 
diff --git a/core/java/android/content/AbstractSyncableContentProvider.java b/core/java/android/content/AbstractSyncableContentProvider.java
index ce6501c9f147..edef332cd8c4 100644
--- a/core/java/android/content/AbstractSyncableContentProvider.java
+++ b/core/java/android/content/AbstractSyncableContentProvider.java
@@ -4,8 +4,9 @@ import android.database.sqlite.SQLiteOpenHelper;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.Cursor;
 import android.net.Uri;
-import android.accounts.AccountMonitor;
-import android.accounts.AccountMonitorListener;
+import android.accounts.OnAccountsUpdatedListener;
+import android.accounts.Account;
+import android.accounts.AccountManager;
 import android.provider.SyncConstValue;
 import android.util.Config;
 import android.util.Log;
@@ -14,10 +15,11 @@ import android.text.TextUtils;
 
 import java.util.Collections;
 import java.util.Map;
-import java.util.HashMap;
 import java.util.Vector;
 import java.util.ArrayList;
 
+import com.google.android.collect.Maps;
+
 /**
  * A specialization of the ContentProvider that centralizes functionality
  * used by ContentProviders that are syncable. It also wraps calls to the ContentProvider
@@ -32,21 +34,22 @@ public abstract class AbstractSyncableContentProvider extends SyncableContentPro
     private final String mDatabaseName;
     private final int mDatabaseVersion;
     private final Uri mContentUri;
-    private AccountMonitor mAccountMonitor;
 
     /** the account set in the last call to onSyncStart() */
-    private String mSyncingAccount;
+    private Account mSyncingAccount;
 
     private SyncStateContentProviderHelper mSyncState = null;
 
-    private static final String[] sAccountProjection = new String[] {SyncConstValue._SYNC_ACCOUNT};
+    private static final String[] sAccountProjection =
+            new String[] {SyncConstValue._SYNC_ACCOUNT, SyncConstValue._SYNC_ACCOUNT_TYPE};
 
     private boolean mIsTemporary;
 
     private AbstractTableMerger mCurrentMerger = null;
     private boolean mIsMergeCancelled = false;
 
-    private static final String SYNC_ACCOUNT_WHERE_CLAUSE = SyncConstValue._SYNC_ACCOUNT + "=?";
+    private static final String SYNC_ACCOUNT_WHERE_CLAUSE =
+            SyncConstValue._SYNC_ACCOUNT + "=? AND " + SyncConstValue._SYNC_ACCOUNT_TYPE + "=?";
 
     protected boolean isTemporary() {
         return mIsTemporary;
@@ -147,21 +150,23 @@ public abstract class AbstractSyncableContentProvider extends SyncableContentPro
     @Override
     public boolean onCreate() {
         if (isTemporary()) throw new IllegalStateException("onCreate() called for temp provider");
-        mOpenHelper = new AbstractSyncableContentProvider.DatabaseHelper(getContext(), mDatabaseName);
+        mOpenHelper = new AbstractSyncableContentProvider.DatabaseHelper(getContext(),
+                mDatabaseName);
         mSyncState = new SyncStateContentProviderHelper(mOpenHelper);
-
-        AccountMonitorListener listener = new AccountMonitorListener() {
-            public void onAccountsUpdated(String[] accounts) {
-                // Some providers override onAccountsChanged(); give them a database to work with.
-                mDb = mOpenHelper.getWritableDatabase();
-                onAccountsChanged(accounts);
-                TempProviderSyncAdapter syncAdapter = (TempProviderSyncAdapter)getSyncAdapter();
-                if (syncAdapter != null) {
-                    syncAdapter.onAccountsChanged(accounts);
-                }
-            }
-        };
-        mAccountMonitor = new AccountMonitor(getContext(), listener);
+        AccountManager.get(getContext()).addOnAccountsUpdatedListener(
+                new OnAccountsUpdatedListener() {
+                    public void onAccountsUpdated(Account[] accounts) {
+                        // Some providers override onAccountsChanged(); give them a database to
+                        // work with.
+                        mDb = mOpenHelper.getWritableDatabase();
+                        onAccountsChanged(accounts);
+                        TempProviderSyncAdapter syncAdapter =
+                                (TempProviderSyncAdapter)getSyncAdapter();
+                        if (syncAdapter != null) {
+                            syncAdapter.onAccountsChanged(accounts);
+                        }
+                    }
+                }, null /* handler */, true /* updateImmediately */);
 
         return true;
     }
@@ -365,8 +370,8 @@ public abstract class AbstractSyncableContentProvider extends SyncableContentPro
      * @param context the sync context for the operation
      * @param account
      */
-    public void onSyncStart(SyncContext context, String account) {
-        if (TextUtils.isEmpty(account)) {
+    public void onSyncStart(SyncContext context, Account account) {
+        if (account == null) {
             throw new IllegalArgumentException("you passed in an empty account");
         }
         mSyncingAccount = account;
@@ -385,7 +390,7 @@ public abstract class AbstractSyncableContentProvider extends SyncableContentPro
      * The account of the most recent call to onSyncStart()
      * @return the account
      */
-    public String getSyncingAccount() {
+    public Account getSyncingAccount() {
         return mSyncingAccount;
     }
 
@@ -496,12 +501,11 @@ public abstract class AbstractSyncableContentProvider extends SyncableContentPro
      * Make sure that there are no entries for accounts that no longer exist
      * @param accountsArray the array of currently-existing accounts
      */
-    protected void onAccountsChanged(String[] accountsArray) {
-        Map<String, Boolean> accounts = new HashMap<String, Boolean>();
-        for (String account : accountsArray) {
+    protected void onAccountsChanged(Account[] accountsArray) {
+        Map<Account, Boolean> accounts = Maps.newHashMap();
+        for (Account account : accountsArray) {
             accounts.put(account, false);
         }
-        accounts.put(SyncConstValue.NON_SYNCABLE_ACCOUNT, false);
 
         SQLiteDatabase db = mOpenHelper.getWritableDatabase();
         Map<String, String> tableMap = db.getSyncedTables();
@@ -513,8 +517,7 @@ public abstract class AbstractSyncableContentProvider extends SyncableContentPro
         try {
             mSyncState.onAccountsChanged(accountsArray);
             for (String table : tables) {
-                deleteRowsForRemovedAccounts(accounts, table,
-                        SyncConstValue._SYNC_ACCOUNT);
+                deleteRowsForRemovedAccounts(accounts, table);
             }
             db.setTransactionSuccessful();
         } finally {
@@ -529,23 +532,23 @@ public abstract class AbstractSyncableContentProvider extends SyncableContentPro
      *
      * @param accounts a map of existing accounts
      * @param table the table to delete from
-     * @param accountColumnName the name of the column that is expected
-     * to hold the account.
      */
-    protected void deleteRowsForRemovedAccounts(Map<String, Boolean> accounts,
-            String table, String accountColumnName) {
+    protected void deleteRowsForRemovedAccounts(Map<Account, Boolean> accounts, String table) {
         SQLiteDatabase db = mOpenHelper.getWritableDatabase();
         Cursor c = db.query(table, sAccountProjection, null, null,
-                accountColumnName, null, null);
+                "_sync_account, _sync_account_type", null, null);
         try {
             while (c.moveToNext()) {
-                String account = c.getString(0);
-                if (TextUtils.isEmpty(account)) {
+                String accountName = c.getString(0);
+                String accountType = c.getString(1);
+                if (TextUtils.isEmpty(accountName)) {
                     continue;
                 }
+                Account account = new Account(accountName, accountType);
                 if (!accounts.containsKey(account)) {
                     int numDeleted;
-                    numDeleted = db.delete(table, accountColumnName + "=?", new String[]{account});
+                    numDeleted = db.delete(table, "_sync_account=? AND _sync_account_type=?",
+                            new String[]{account.mName, account.mType});
                     if (Config.LOGV) {
                         Log.v(TAG, "deleted " + numDeleted
                                 + " records from table " + table
@@ -562,7 +565,7 @@ public abstract class AbstractSyncableContentProvider extends SyncableContentPro
      * Called when the sync system determines that this provider should no longer
      * contain records for the specified account.
      */
-    public void wipeAccount(String account) {
+    public void wipeAccount(Account account) {
         SQLiteDatabase db = mOpenHelper.getWritableDatabase();
         Map<String, String> tableMap = db.getSyncedTables();
         ArrayList<String> tables = new ArrayList<String>();
@@ -577,7 +580,8 @@ public abstract class AbstractSyncableContentProvider extends SyncableContentPro
 
             // remove the data in the synced tables
             for (String table : tables) {
-                db.delete(table, SYNC_ACCOUNT_WHERE_CLAUSE, new String[]{account});
+                db.delete(table, SYNC_ACCOUNT_WHERE_CLAUSE,
+                        new String[]{account.mName, account.mType});
             }
             db.setTransactionSuccessful();
         } finally {
@@ -588,14 +592,14 @@ public abstract class AbstractSyncableContentProvider extends SyncableContentPro
     /**
      * Retrieves the SyncData bytes for the given account. The byte array returned may be null.
      */
-    public byte[] readSyncDataBytes(String account) {
+    public byte[] readSyncDataBytes(Account account) {
         return mSyncState.readSyncDataBytes(mOpenHelper.getReadableDatabase(), account);
     }
 
     /**
      * Sets the SyncData bytes for the given account. The byte array may be null.
      */
-    public void writeSyncDataBytes(String account, byte[] data) {
+    public void writeSyncDataBytes(Account account, byte[] data) {
         mSyncState.writeSyncDataBytes(mOpenHelper.getWritableDatabase(), account, data);
     }
 }
diff --git a/core/java/android/content/AbstractTableMerger.java b/core/java/android/content/AbstractTableMerger.java
index 55885134de84..8c9955a27a1f 100644
--- a/core/java/android/content/AbstractTableMerger.java
+++ b/core/java/android/content/AbstractTableMerger.java
@@ -25,6 +25,7 @@ import android.provider.BaseColumns;
 import static android.provider.SyncConstValue.*;
 import android.text.TextUtils;
 import android.util.Log;
+import android.accounts.Account;
 
 /**
  * @hide
@@ -55,14 +56,16 @@ public abstract class AbstractTableMerger
 
     private volatile boolean mIsMergeCancelled;
 
-    private static final String SELECT_MARKED = _SYNC_MARK + "> 0 and " + _SYNC_ACCOUNT + "=?";
+    private static final String SELECT_MARKED = _SYNC_MARK + "> 0 and "
+            + _SYNC_ACCOUNT + "=? and " + _SYNC_ACCOUNT_TYPE + "=?";
 
     private static final String SELECT_BY_SYNC_ID_AND_ACCOUNT =
-            _SYNC_ID +"=? and " + _SYNC_ACCOUNT + "=?";
+            _SYNC_ID +"=? and " + _SYNC_ACCOUNT + "=? and " + _SYNC_ACCOUNT_TYPE + "=?";
     private static final String SELECT_BY_ID = BaseColumns._ID +"=?";
 
     private static final String SELECT_UNSYNCED = ""
-            + _SYNC_DIRTY + " > 0 and (" + _SYNC_ACCOUNT + "=? or " + _SYNC_ACCOUNT + " is null)";
+            + _SYNC_DIRTY + " > 0 and ((" + _SYNC_ACCOUNT + "=? AND " + _SYNC_ACCOUNT_TYPE + "=?) "
+            + "or " + _SYNC_ACCOUNT + " is null)";
 
     public AbstractTableMerger(SQLiteDatabase database,
             String table, Uri tableURL, String deletedTable,
@@ -132,7 +135,7 @@ public abstract class AbstractTableMerger
      * construct a temporary instance to hold them.
      */
     public void merge(final SyncContext context,
-            final String account,
+            final Account account,
             final SyncableContentProvider serverDiffs,
             TempProviderSyncResult result,
             SyncResult syncResult, SyncableContentProvider temporaryInstanceFactory) {
@@ -155,7 +158,7 @@ public abstract class AbstractTableMerger
      * @hide this is public for testing purposes only
      */
     public void mergeServerDiffs(SyncContext context,
-            String account, SyncableContentProvider serverDiffs, SyncResult syncResult) {
+            Account account, SyncableContentProvider serverDiffs, SyncResult syncResult) {
         boolean diffsArePartial = serverDiffs.getContainsDiffs();
         // mark the current rows so that we can distinguish these from new
         // inserts that occur during the merge
@@ -169,7 +172,7 @@ public abstract class AbstractTableMerger
         Cursor diffsCursor = null;
         try {
             // load the local database entries, so we can merge them with the server
-            final String[] accountSelectionArgs = new String[]{account};
+            final String[] accountSelectionArgs = new String[]{account.mName, account.mType};
             localCursor = mDb.query(mTable, syncDirtyProjection,
                     SELECT_MARKED, accountSelectionArgs, null, null,
                     mTable + "." + _SYNC_ID);
@@ -462,7 +465,7 @@ public abstract class AbstractTableMerger
         }
     }
 
-    private void fullyDeleteMatchingRows(Cursor diffsCursor, String account,
+    private void fullyDeleteMatchingRows(Cursor diffsCursor, Account account,
             SyncResult syncResult) {
         int serverSyncIdColumn = diffsCursor.getColumnIndexOrThrow(_SYNC_ID);
         final boolean deleteBySyncId = !diffsCursor.isNull(serverSyncIdColumn);
@@ -472,7 +475,8 @@ public abstract class AbstractTableMerger
         Cursor c = null;
         try {
             if (deleteBySyncId) {
-                selectionArgs = new String[]{diffsCursor.getString(serverSyncIdColumn), account};
+                selectionArgs = new String[]{diffsCursor.getString(serverSyncIdColumn),
+                        account.mName, account.mType};
                 c = mDb.query(mTable, new String[]{BaseColumns._ID}, SELECT_BY_SYNC_ID_AND_ACCOUNT,
                         selectionArgs, null, null, null);
             } else {
@@ -505,21 +509,21 @@ public abstract class AbstractTableMerger
      * Finds local changes, placing the results in the given result object.
      * @param temporaryInstanceFactory As an optimization for the case
      * where there are no client-side diffs, mergeResult may initially
-     * have no {@link android.content.TempProviderSyncResult#tempContentProvider}.  If this is
+     * have no {@link TempProviderSyncResult#tempContentProvider}.  If this is
      * the first in the sequence of AbstractTableMergers to find
      * client-side diffs, it will use the given ContentProvider to
      * create a temporary instance and store its {@link
-     * ContentProvider} in the mergeResult.
+     * android.content.ContentProvider} in the mergeResult.
      * @param account
      * @param syncResult
      */
     private void findLocalChanges(TempProviderSyncResult mergeResult,
-            SyncableContentProvider temporaryInstanceFactory, String account,
+            SyncableContentProvider temporaryInstanceFactory, Account account,
             SyncResult syncResult) {
         SyncableContentProvider clientDiffs = mergeResult.tempContentProvider;
         if (Log.isLoggable(TAG, Log.VERBOSE)) Log.v(TAG, "generating client updates");
 
-        final String[] accountSelectionArgs = new String[]{account};
+        final String[] accountSelectionArgs = new String[]{account.mName, account.mType};
 
         // Generate the client updates and insertions
         // Create a cursor for dirty records
@@ -553,7 +557,8 @@ public abstract class AbstractTableMerger
         if (mDeletedTable != null) {
             Cursor deletedCursor = mDb.query(mDeletedTable,
                     syncIdAndVersionProjection,
-                    _SYNC_ACCOUNT + "=? AND " + _SYNC_ID + " IS NOT NULL", accountSelectionArgs,
+                    _SYNC_ACCOUNT + "=? AND " + _SYNC_ACCOUNT_TYPE + "=? AND "
+                            + _SYNC_ID + " IS NOT NULL", accountSelectionArgs,
                     null, null, mDeletedTable + "." + _SYNC_ID);
             try {
                 numDeletedEntries = deletedCursor.getCount();
diff --git a/core/java/android/content/ContentResolver.java b/core/java/android/content/ContentResolver.java
index 0d886ee23e8d..65772367ddeb 100644
--- a/core/java/android/content/ContentResolver.java
+++ b/core/java/android/content/ContentResolver.java
@@ -28,6 +28,7 @@ import android.os.Bundle;
 import android.os.ParcelFileDescriptor;
 import android.os.RemoteException;
 import android.text.TextUtils;
+import android.accounts.Account;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -541,7 +542,7 @@ public abstract class ContentResolver {
                      A null value will remove an existing field value.
      * @param where A filter to apply to rows before deleting, formatted as an SQL WHERE clause
                     (excluding the WHERE itself).
-     * @return the URL of the newly created row
+     * @return The number of rows updated.
      * @throws NullPointerException if uri or values are null
      */
     public final int update(Uri uri, ContentValues values, String where,
@@ -691,6 +692,7 @@ public abstract class ContentResolver {
      * <li>Float</li>
      * <li>Double</li>
      * <li>String</li>
+     * <li>Account</li>
      * <li>null</li>
      * </ul>
      * @param extras the Bundle to check
@@ -706,6 +708,7 @@ public abstract class ContentResolver {
                 if (value instanceof Float) continue;
                 if (value instanceof Double) continue;
                 if (value instanceof String) continue;
+                if (value instanceof Account) continue;
                 throw new IllegalArgumentException("unexpected value type: "
                         + value.getClass().getName());
             }
diff --git a/core/java/android/content/ISyncAdapter.aidl b/core/java/android/content/ISyncAdapter.aidl
index 671188cd50c5..d228605b83a4 100644
--- a/core/java/android/content/ISyncAdapter.aidl
+++ b/core/java/android/content/ISyncAdapter.aidl
@@ -16,6 +16,7 @@
 
 package android.content;
 
+import android.accounts.Account;
 import android.os.Bundle;
 import android.content.ISyncContext;
 
@@ -33,7 +34,7 @@ oneway interface ISyncAdapter {
      * @param account the account that should be synced
      * @param extras SyncAdapter-specific parameters
      */
-    void startSync(ISyncContext syncContext, String account, in Bundle extras);
+    void startSync(ISyncContext syncContext, in Account account, in Bundle extras);
 
     /**
      * Cancel the most recently initiated sync. Due to race conditions, this may arrive
diff --git a/core/java/android/content/SyncAdapter.java b/core/java/android/content/SyncAdapter.java
index 7826e5052ab7..3e916262f961 100644
--- a/core/java/android/content/SyncAdapter.java
+++ b/core/java/android/content/SyncAdapter.java
@@ -18,6 +18,7 @@ package android.content;
 
 import android.os.Bundle;
 import android.os.RemoteException;
+import android.accounts.Account;
 
 /**
  * @hide
@@ -29,7 +30,7 @@ public abstract class SyncAdapter {
     public static final int LOG_SYNC_DETAILS = 2743;
 
     class Transport extends ISyncAdapter.Stub {
-        public void startSync(ISyncContext syncContext, String account,
+        public void startSync(ISyncContext syncContext, Account account,
                 Bundle extras) throws RemoteException {
             SyncAdapter.this.startSync(new SyncContext(syncContext), account, extras);
         }
@@ -59,7 +60,7 @@ public abstract class SyncAdapter {
      * @param account the account that should be synced
      * @param extras SyncAdapter-specific parameters
      */
-    public abstract void startSync(SyncContext syncContext, String account, Bundle extras);
+    public abstract void startSync(SyncContext syncContext, Account account, Bundle extras);
 
     /**
      * Cancel the most recently initiated sync. Due to race conditions, this may arrive
diff --git a/core/java/android/content/SyncManager.java b/core/java/android/content/SyncManager.java
index 01b07eb415df..4474c6277a88 100644
--- a/core/java/android/content/SyncManager.java
+++ b/core/java/android/content/SyncManager.java
@@ -21,8 +21,9 @@ import com.google.android.collect.Maps;
 import com.android.internal.R;
 import com.android.internal.util.ArrayUtils;
 
-import android.accounts.AccountMonitor;
-import android.accounts.AccountMonitorListener;
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.accounts.OnAccountsUpdatedListener;
 import android.app.AlarmManager;
 import android.app.Notification;
 import android.app.NotificationManager;
@@ -50,8 +51,6 @@ import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.os.SystemClock;
 import android.os.SystemProperties;
-import android.preference.Preference;
-import android.preference.PreferenceGroup;
 import android.provider.Sync;
 import android.provider.Settings;
 import android.provider.Sync.History;
@@ -84,7 +83,7 @@ import java.util.Observable;
 /**
  * @hide
  */
-class SyncManager {
+class SyncManager implements OnAccountsUpdatedListener {
     private static final String TAG = "SyncManager";
 
     // used during dumping of the Sync history
@@ -130,9 +129,7 @@ class SyncManager {
     private String mStatusText = "";
     private long mHeartbeatTime = 0;
 
-    private AccountMonitor mAccountMonitor;
-
-    private volatile String[] mAccounts = null;
+    private volatile Account[] mAccounts = null;
 
     volatile private PowerManager.WakeLock mSyncWakeLock;
     volatile private PowerManager.WakeLock mHandleAlarmWakeLock;
@@ -184,43 +181,39 @@ class SyncManager {
     private BroadcastReceiver mBootCompletedReceiver = new BroadcastReceiver() {
         public void onReceive(Context context, Intent intent) {
             if (!mFactoryTest) {
-                AccountMonitorListener listener = new AccountMonitorListener() {
-                    public void onAccountsUpdated(String[] accounts) {
-                        final boolean hadAccountsAlready = mAccounts != null;
-                        // copy the accounts into a new array and change mAccounts to point to it
-                        String[] newAccounts = new String[accounts.length];
-                        System.arraycopy(accounts, 0, newAccounts, 0, accounts.length);
-                        mAccounts = newAccounts;
-
-                        // if a sync is in progress yet it is no longer in the accounts list,
-                        // cancel it
-                        ActiveSyncContext activeSyncContext = mActiveSyncContext;
-                        if (activeSyncContext != null) {
-                            if (!ArrayUtils.contains(newAccounts,
-                                    activeSyncContext.mSyncOperation.account)) {
-                                Log.d(TAG, "canceling sync since the account has been removed");
-                                sendSyncFinishedOrCanceledMessage(activeSyncContext,
-                                        null /* no result since this is a cancel */);
-                            }
-                        }
-
-                        // we must do this since we don't bother scheduling alarms when
-                        // the accounts are not set yet
-                        sendCheckAlarmsMessage();
+                AccountManager.get(mContext).addOnAccountsUpdatedListener(SyncManager.this,
+                        mSyncHandler, true /* updateImmediately */);
+            }
+        }
+    };
 
-                        mSyncStorageEngine.doDatabaseCleanup(accounts);
+    public void onAccountsUpdated(Account[] accounts) {
+        final boolean hadAccountsAlready = mAccounts != null;
+        mAccounts = accounts;
 
-                        if (hadAccountsAlready && mAccounts.length > 0) {
-                            // request a sync so that if the password was changed we will
-                            // retry any sync that failed when it was wrong
-                            startSync(null /* all providers */, null /* no extras */);
-                        }
-                    }
-                };
-                mAccountMonitor = new AccountMonitor(context, listener);
+        // if a sync is in progress yet it is no longer in the accounts list,
+        // cancel it
+        ActiveSyncContext activeSyncContext = mActiveSyncContext;
+        if (activeSyncContext != null) {
+            if (!ArrayUtils.contains(accounts, activeSyncContext.mSyncOperation.account)) {
+                Log.d(TAG, "canceling sync since the account has been removed");
+                sendSyncFinishedOrCanceledMessage(activeSyncContext,
+                        null /* no result since this is a cancel */);
             }
         }
-    };
+
+        // we must do this since we don't bother scheduling alarms when
+        // the accounts are not set yet
+        sendCheckAlarmsMessage();
+
+        mSyncStorageEngine.doDatabaseCleanup(accounts);
+
+        if (hadAccountsAlready && accounts.length > 0) {
+            // request a sync so that if the password was changed we will
+            // retry any sync that failed when it was wrong
+            startSync(null /* all providers */, null /* no extras */);
+        }
+    }
 
     private BroadcastReceiver mConnectivityIntentReceiver =
             new BroadcastReceiver() {
@@ -486,7 +479,7 @@ class SyncManager {
         }
     }
 
-    public String getSyncingAccount() {
+    public Account getSyncingAccount() {
         ActiveSyncContext activeSyncContext = mActiveSyncContext;
         return (activeSyncContext != null) ? activeSyncContext.mSyncOperation.account : null;
     }
@@ -557,10 +550,10 @@ class SyncManager {
             delay = -1; // this means schedule at the front of the queue
         }
 
-        String[] accounts;
-        String accountFromExtras = extras.getString(ContentResolver.SYNC_EXTRAS_ACCOUNT);
-        if (!TextUtils.isEmpty(accountFromExtras)) {
-            accounts = new String[]{accountFromExtras};
+        Account[] accounts;
+        Account accountFromExtras = extras.getParcelable(ContentResolver.SYNC_EXTRAS_ACCOUNT);
+        if (accountFromExtras != null) {
+            accounts = new Account[]{accountFromExtras};
         } else {
             // if the accounts aren't configured yet then we can't support an account-less
             // sync request
@@ -605,7 +598,7 @@ class SyncManager {
         for (int i = 0; i < numProviders; i++) {
             if (!providers.get(i).isSyncable) continue;
             final String name = names.get(i);
-            for (String account : accounts) {
+            for (Account account : accounts) {
                 scheduleSyncOperation(new SyncOperation(account, source, name, extras, delay));
                 // TODO: remove this when Calendar supports multiple accounts. Until then
                 // pretend that only the first account exists when syncing calendar.
@@ -881,7 +874,7 @@ class SyncManager {
      * Value type that represents a sync operation.
      */
     static class SyncOperation implements Comparable {
-        final String account;
+        final Account account;
         int syncSource;
         String authority;
         Bundle extras;
@@ -890,7 +883,7 @@ class SyncManager {
         long delay;
         Long rowId = null;
 
-        SyncOperation(String account, int source, String authority, Bundle extras, long delay) {
+        SyncOperation(Account account, int source, String authority, Bundle extras, long delay) {
             this.account = account;
             this.syncSource = source;
             this.authority = authority;
@@ -1024,7 +1017,7 @@ class SyncManager {
         sb.append("data connected: ").append(mDataConnectionIsConnected).append("\n");
         sb.append("memory low: ").append(mStorageIsLow).append("\n");
 
-        final String[] accounts = mAccounts;
+        final Account[] accounts = mAccounts;
         sb.append("accounts: ");
         if (accounts != null) {
             sb.append(accounts.length);
@@ -1095,17 +1088,18 @@ class SyncManager {
             c.close();
         }
 
-        String currentAccount = null;
+        Account currentAccount = null;
         c = mSyncStorageEngine.query(Sync.Status.CONTENT_URI,
-                STATUS_PROJECTION, null, null, "account, authority");
+                STATUS_PROJECTION, null, null, "account_type, account, authority");
         sb.append("\nSync history by account and authority\n");
         try {
             while (c.moveToNext()) {
-                if (!TextUtils.equals(currentAccount, c.getString(0))) {
+                final Account account = new Account(c.getString(0), c.getString(13));
+                if (!account.equals(currentAccount)) {
                     if (currentAccount != null) {
                         dumpSyncHistoryFooter(sb);
                     }
-                    currentAccount = c.getString(0);
+                    currentAccount = account;
                     dumpSyncHistoryHeader(sb, currentAccount);
                 }
 
@@ -1117,8 +1111,8 @@ class SyncManager {
         }
     }
 
-    private void dumpSyncHistoryHeader(StringBuilder sb, String account) {
-        sb.append(" Account: ").append(account).append("\n");
+    private void dumpSyncHistoryHeader(StringBuilder sb, Account account) {
+        sb.append(" ").append(account).append("\n");
         sb.append("  ___________________________________________________________________________________________________________________________\n");
         sb.append(" |                 |             num times synced           |   total  |         last success          |                     |\n");
         sb.append(" | authority       | local |  poll | server |  user | total | duration |  source |               time  |   result if failing |\n");
@@ -1137,7 +1131,8 @@ class SyncManager {
             Sync.Status.LAST_SUCCESS_TIME, // 9
             Sync.Status.LAST_FAILURE_SOURCE, // 10
             Sync.Status.LAST_FAILURE_TIME, // 11
-            Sync.Status.LAST_FAILURE_MESG // 12
+            Sync.Status.LAST_FAILURE_MESG, // 12
+            Sync.Status.ACCOUNT_TYPE, // 13
     };
 
     private void dumpSyncHistoryRow(StringBuilder sb, Cursor c) {
@@ -1305,7 +1300,7 @@ class SyncManager {
          */
         class SyncNotificationInfo {
             // only valid if isActive is true
-            public String account;
+            public Account account;
 
             // only valid if isActive is true
             public String authority;
@@ -1460,7 +1455,7 @@ class SyncManager {
 
             // If the accounts aren't known yet then we aren't ready to run. We will be kicked
             // when the account lookup request does complete.
-            String[] accounts = mAccounts;
+            Account[] accounts = mAccounts;
             if (accounts == null) {
                 if (isLoggable) {
                     Log.v(TAG, "runStateIdle: accounts not known, skipping");
@@ -1857,7 +1852,7 @@ class SyncManager {
             mContext.sendBroadcast(syncStateIntent);
         }
 
-        private void installHandleTooManyDeletesNotification(String account, String authority,
+        private void installHandleTooManyDeletesNotification(Account account, String authority,
                 long numDeletes) {
             if (mNotificationMgr == null) return;
             Intent clickIntent = new Intent();
@@ -1937,14 +1932,16 @@ class SyncManager {
                 "_id",
                 "authority",
                 "account",
+                "account_type",
                 "extras",
-                "source"
+                "source",
         };
         private static final int COLUMN_ID = 0;
         private static final int COLUMN_AUTHORITY = 1;
         private static final int COLUMN_ACCOUNT = 2;
-        private static final int COLUMN_EXTRAS = 3;
-        private static final int COLUMN_SOURCE = 4;
+        private static final int COLUMN_ACCOUNT_TYPE = 3;
+        private static final int COLUMN_EXTRAS = 4;
+        private static final int COLUMN_SOURCE = 5;
 
         private static final boolean DEBUG_CHECK_DATA_CONSISTENCY = false;
 
@@ -2026,7 +2023,8 @@ class SyncManager {
                     parcel.recycle();
                 }
                 ContentValues values = new ContentValues();
-                values.put("account", operation.account);
+                values.put("account", operation.account.mName);
+                values.put("account_type", operation.account.mType);
                 values.put("authority", operation.authority);
                 values.put("source", operation.syncSource);
                 values.put("extras", extrasData);
@@ -2084,7 +2082,7 @@ class SyncManager {
             if (DEBUG_CHECK_DATA_CONSISTENCY) debugCheckDataStructures(true /* check the DB */);
         }
 
-        public void clear(String account, String authority) {
+        public void clear(Account account, String authority) {
             Iterator<Map.Entry<String, SyncOperation>> entries = mOpsByKey.entrySet().iterator();
             while (entries.hasNext()) {
                 Map.Entry<String, SyncOperation> entry = entries.next();
@@ -2175,7 +2173,8 @@ class SyncManager {
             }
 
             SyncOperation syncOperation = new SyncOperation(
-                    cursor.getString(COLUMN_ACCOUNT),
+                    new Account(cursor.getString(COLUMN_ACCOUNT),
+                            cursor.getString(COLUMN_ACCOUNT_TYPE)),
                     cursor.getInt(COLUMN_SOURCE),
                     cursor.getString(COLUMN_AUTHORITY),
                     extras,
diff --git a/core/java/android/content/SyncStateContentProviderHelper.java b/core/java/android/content/SyncStateContentProviderHelper.java
index f503e6f3521d..dc728eccf3d4 100644
--- a/core/java/android/content/SyncStateContentProviderHelper.java
+++ b/core/java/android/content/SyncStateContentProviderHelper.java
@@ -23,6 +23,7 @@ import android.database.DatabaseUtils;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.net.Uri;
+import android.accounts.Account;
 
 /**
  * Extends the schema of a ContentProvider to include the _sync_state table
@@ -43,14 +44,15 @@ public class SyncStateContentProviderHelper {
     private static final Uri CONTENT_URI =
             Uri.parse("content://" + SYNC_STATE_AUTHORITY + "/state");
 
-    private static final String ACCOUNT_WHERE = "_sync_account = ?";
+    private static final String ACCOUNT_WHERE = "_sync_account = ? AND _sync_account_type = ?";
 
     private final Provider mInternalProviderInterface;
 
     private static final String SYNC_STATE_TABLE = "_sync_state";
-    private static long DB_VERSION = 2;
+    private static long DB_VERSION = 3;
 
-    private static final String[] ACCOUNT_PROJECTION = new String[]{"_sync_account"};
+    private static final String[] ACCOUNT_PROJECTION =
+            new String[]{"_sync_account", "_sync_account_type"};
 
     static {
         sURIMatcher.addURI(SYNC_STATE_AUTHORITY, "state", STATE);
@@ -70,8 +72,9 @@ public class SyncStateContentProviderHelper {
         db.execSQL("CREATE TABLE _sync_state (" +
                    "_id INTEGER PRIMARY KEY," +
                    "_sync_account TEXT," +
+                   "_sync_account_type TEXT," +
                    "data TEXT," +
-                   "UNIQUE(_sync_account)" +
+                   "UNIQUE(_sync_account, _sync_account_type)" +
                    ");");
 
         db.execSQL("DROP TABLE IF EXISTS _sync_state_metadata");
@@ -168,15 +171,17 @@ public class SyncStateContentProviderHelper {
      * @param account the account of the row that should be copied over.
      */
     public void copySyncState(SQLiteDatabase dbSrc, SQLiteDatabase dbDest,
-            String account) {
-        final String[] whereArgs = new String[]{account};
-        Cursor c = dbSrc.query(SYNC_STATE_TABLE, new String[]{"_sync_account", "data"},
+            Account account) {
+        final String[] whereArgs = new String[]{account.mName, account.mType};
+        Cursor c = dbSrc.query(SYNC_STATE_TABLE,
+                new String[]{"_sync_account", "_sync_account_type", "data"},
                 ACCOUNT_WHERE, whereArgs, null, null, null);
         try {
             if (c.moveToNext()) {
                 ContentValues values = new ContentValues();
                 values.put("_sync_account", c.getString(0));
-                values.put("data", c.getBlob(1));
+                values.put("_sync_account_type", c.getString(1));
+                values.put("data", c.getBlob(2));
                 dbDest.replace(SYNC_STATE_TABLE, "_sync_account", values);
             }
         } finally {
@@ -184,14 +189,17 @@ public class SyncStateContentProviderHelper {
         }
     }
 
-    public void onAccountsChanged(String[] accounts) {
+    public void onAccountsChanged(Account[] accounts) {
         SQLiteDatabase db = mOpenHelper.getWritableDatabase();
         Cursor c = db.query(SYNC_STATE_TABLE, ACCOUNT_PROJECTION, null, null, null, null, null);
         try {
             while (c.moveToNext()) {
-                final String account = c.getString(0);
+                final String accountName = c.getString(0);
+                final String accountType = c.getString(1);
+                Account account = new Account(accountName, accountType);
                 if (!ArrayUtils.contains(accounts, account)) {
-                    db.delete(SYNC_STATE_TABLE, ACCOUNT_WHERE, new String[]{account});
+                    db.delete(SYNC_STATE_TABLE, ACCOUNT_WHERE,
+                            new String[]{accountName, accountType});
                 }
             }
         } finally {
@@ -199,9 +207,9 @@ public class SyncStateContentProviderHelper {
         }
     }
 
-    public void discardSyncData(SQLiteDatabase db, String account) {
+    public void discardSyncData(SQLiteDatabase db, Account account) {
         if (account != null) {
-            db.delete(SYNC_STATE_TABLE, ACCOUNT_WHERE, new String[]{account});
+            db.delete(SYNC_STATE_TABLE, ACCOUNT_WHERE, new String[]{account.mName, account.mType});
         } else {
             db.delete(SYNC_STATE_TABLE, null, null);
         }
@@ -210,9 +218,9 @@ public class SyncStateContentProviderHelper {
     /**
      * Retrieves the SyncData bytes for the given account. The byte array returned may be null.
      */
-    public byte[] readSyncDataBytes(SQLiteDatabase db, String account) {
+    public byte[] readSyncDataBytes(SQLiteDatabase db, Account account) {
         Cursor c = db.query(SYNC_STATE_TABLE, null, ACCOUNT_WHERE,
-                new String[]{account}, null, null, null);
+                new String[]{account.mName, account.mType}, null, null, null);
         try {
             if (c.moveToFirst()) {
                 return c.getBlob(c.getColumnIndexOrThrow("data"));
@@ -226,9 +234,10 @@ public class SyncStateContentProviderHelper {
     /**
      * Sets the SyncData bytes for the given account. The bytes array may be null.
      */
-    public void writeSyncDataBytes(SQLiteDatabase db, String account, byte[] data) {
+    public void writeSyncDataBytes(SQLiteDatabase db, Account account, byte[] data) {
         ContentValues values = new ContentValues();
         values.put("data", data);
-        db.update(SYNC_STATE_TABLE, values, ACCOUNT_WHERE, new String[]{account});
+        db.update(SYNC_STATE_TABLE, values, ACCOUNT_WHERE,
+                new String[]{account.mName, account.mType});
     }
 }
diff --git a/core/java/android/content/SyncStorageEngine.java b/core/java/android/content/SyncStorageEngine.java
index 282f6e71db70..2ad44d256725 100644
--- a/core/java/android/content/SyncStorageEngine.java
+++ b/core/java/android/content/SyncStorageEngine.java
@@ -1,6 +1,7 @@
 package android.content;
 
 import android.Manifest;
+import android.accounts.Account;
 import android.database.Cursor;
 import android.database.DatabaseUtils;
 import android.database.sqlite.SQLiteDatabase;
@@ -16,6 +17,8 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 
+import com.google.android.collect.Sets;
+
 /**
  * ContentProvider that tracks the sync data and overall sync
  * history on the device.
@@ -26,7 +29,7 @@ public class SyncStorageEngine {
     private static final String TAG = "SyncManager";
 
     private static final String DATABASE_NAME = "syncmanager.db";
-    private static final int DATABASE_VERSION = 10;
+    private static final int DATABASE_VERSION = 11;
 
     private static final int STATS = 1;
     private static final int STATS_ID = 2;
@@ -63,17 +66,20 @@ public class SyncStorageEngine {
         PENDING_PROJECTION_MAP = map = new HashMap<String,String>();
         map.put(Sync.History._ID, Sync.History._ID);
         map.put(Sync.History.ACCOUNT, Sync.History.ACCOUNT);
+        map.put(Sync.History.ACCOUNT_TYPE, Sync.History.ACCOUNT_TYPE);
         map.put(Sync.History.AUTHORITY, Sync.History.AUTHORITY);
 
         ACTIVE_PROJECTION_MAP = map = new HashMap<String,String>();
         map.put(Sync.History._ID, Sync.History._ID);
         map.put(Sync.History.ACCOUNT, Sync.History.ACCOUNT);
+        map.put(Sync.History.ACCOUNT_TYPE, Sync.History.ACCOUNT_TYPE);
         map.put(Sync.History.AUTHORITY, Sync.History.AUTHORITY);
         map.put("startTime", "startTime");
 
         HISTORY_PROJECTION_MAP = map = new HashMap<String,String>();
         map.put(Sync.History._ID, "history._id as _id");
         map.put(Sync.History.ACCOUNT, "stats.account as account");
+        map.put(Sync.History.ACCOUNT_TYPE, "stats.account_type as account_type");
         map.put(Sync.History.AUTHORITY, "stats.authority as authority");
         map.put(Sync.History.EVENT, Sync.History.EVENT);
         map.put(Sync.History.EVENT_TIME, Sync.History.EVENT_TIME);
@@ -86,6 +92,7 @@ public class SyncStorageEngine {
         STATUS_PROJECTION_MAP = map = new HashMap<String,String>();
         map.put(Sync.Status._ID, "status._id as _id");
         map.put(Sync.Status.ACCOUNT, "stats.account as account");
+        map.put(Sync.Status.ACCOUNT_TYPE, "stats.account_type as account_type");
         map.put(Sync.Status.AUTHORITY, "stats.authority as authority");
         map.put(Sync.Status.TOTAL_ELAPSED_TIME, Sync.Status.TOTAL_ELAPSED_TIME);
         map.put(Sync.Status.NUM_SYNCS, Sync.Status.NUM_SYNCS);
@@ -102,7 +109,7 @@ public class SyncStorageEngine {
     }
 
     private static final String[] STATS_ACCOUNT_PROJECTION =
-            new String[] { Sync.Stats.ACCOUNT };
+            new String[] { Sync.Stats.ACCOUNT, Sync.Stats.ACCOUNT_TYPE };
 
     private static final int MAX_HISTORY_EVENTS_TO_KEEP = 5000;
 
@@ -151,6 +158,7 @@ public class SyncStorageEngine {
                     + "_id INTEGER PRIMARY KEY,"
                     + "authority TEXT NOT NULL,"
                     + "account TEXT NOT NULL,"
+                    + "account_type TEXT NOT NULL,"
                     + "extras BLOB NOT NULL,"
                     + "source INTEGER NOT NULL"
                     + ");");
@@ -158,6 +166,7 @@ public class SyncStorageEngine {
             db.execSQL("CREATE TABLE stats (" +
                        "_id INTEGER PRIMARY KEY," +
                        "account TEXT, " +
+                       "account_type TEXT, " +
                        "authority TEXT, " +
                        "syncdata TEXT, " +
                        "UNIQUE (account, authority)" +
@@ -195,6 +204,7 @@ public class SyncStorageEngine {
                     + "_id INTEGER PRIMARY KEY,"
                     + "authority TEXT,"
                     + "account TEXT,"
+                    + "account_type TEXT,"
                     + "startTime INTEGER);");
 
             db.execSQL("CREATE INDEX historyEventTime ON history (eventTime)");
@@ -206,10 +216,27 @@ public class SyncStorageEngine {
 
         @Override
         public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-            if (oldVersion == 9 && newVersion == 10) {
+            if (oldVersion == 9) {
                 Log.w(TAG, "Upgrading database from version " + oldVersion + " to "
                         + newVersion + ", which will preserve old data");
                 db.execSQL("ALTER TABLE status ADD COLUMN initialFailureTime INTEGER");
+                oldVersion++;
+            }
+
+            if (oldVersion == 10) {
+                Log.w(TAG, "Upgrading database from version " + oldVersion + " to "
+                        + newVersion + ", which will preserve old data");
+                db.execSQL("ALTER TABLE pending ADD COLUMN account_type TEXT");
+                db.execSQL("ALTER TABLE stats ADD COLUMN account_type TEXT");
+                db.execSQL("ALTER TABLE active ADD COLUMN account_type TEXT");
+
+                db.execSQL("UPDATE pending SET account_type='com.google.GAIA'");
+                db.execSQL("UPDATE stats SET account_type='com.google.GAIA'");
+                db.execSQL("UPDATE active SET account_type='com.google.GAIA'");
+                oldVersion++;
+            }
+
+            if (oldVersion == newVersion) {
                 return;
             }
 
@@ -233,23 +260,23 @@ public class SyncStorageEngine {
         }
     }
 
-    protected void doDatabaseCleanup(String[] accounts) {
-        HashSet<String> currentAccounts = new HashSet<String>();
-        for (String account : accounts) currentAccounts.add(account);
+    protected void doDatabaseCleanup(Account[] accounts) {
+        HashSet<Account> currentAccounts = Sets.newHashSet(accounts);
         SQLiteDatabase db = mOpenHelper.getWritableDatabase();
         Cursor cursor = db.query("stats", STATS_ACCOUNT_PROJECTION,
-                null /* where */, null /* where args */, Sync.Stats.ACCOUNT,
+                null /* where */, null /* where args */,
+                Sync.Stats.ACCOUNT + "," + Sync.Stats.ACCOUNT_TYPE,
                 null /* having */, null /* order by */);
         try {
             while (cursor.moveToNext()) {
-                String account = cursor.getString(0);
-                if (TextUtils.isEmpty(account)) {
-                    continue;
-                }
+                String accountName = cursor.getString(0);
+                String accountType = cursor.getString(1);
+                final Account account = new Account(accountName, accountType);
                 if (!currentAccounts.contains(account)) {
-                    String where = Sync.Stats.ACCOUNT + "=?";
+                    String where = Sync.Stats.ACCOUNT + "=? AND " + Sync.Stats.ACCOUNT_TYPE + "=?";
                     int numDeleted;
-                    numDeleted = db.delete("stats", where, new String[]{account});
+                    numDeleted = db.delete("stats", where,
+                            new String[]{account.mName, account.mType});
                     if (Config.LOGD) {
                         Log.d(TAG, "deleted " + numDeleted
                                 + " records from stats table"
@@ -272,10 +299,11 @@ public class SyncStorageEngine {
         }
     }
 
-    private int updateActiveSync(String account, String authority, Long startTime) {
+    private int updateActiveSync(Account account, String authority, Long startTime) {
         SQLiteDatabase db = mOpenHelper.getWritableDatabase();
         ContentValues values = new ContentValues();
-        values.put("account", account);
+        values.put("account", account == null ? null : account.mName);
+        values.put("account_type", account == null ? null : account.mType);
         values.put("authority", authority);
         values.put("startTime", startTime);
         int numChanges = db.update("active", values, null, null);
@@ -463,7 +491,9 @@ public class SyncStorageEngine {
             db.beginTransaction();
             long rowId = db.insert("pending", Sync.Pending.ACCOUNT, values);
             if (rowId < 0) return null;
-            String account = values.getAsString(Sync.Pending.ACCOUNT);
+            String accountName = values.getAsString(Sync.Pending.ACCOUNT);
+            String accountType = values.getAsString(Sync.Pending.ACCOUNT_TYPE);
+            final Account account = new Account(accountName, accountType);
             String authority = values.getAsString(Sync.Pending.AUTHORITY);
 
             long statsId = createStatsRowIfNecessary(account, authority);
@@ -491,25 +521,31 @@ public class SyncStorageEngine {
         SQLiteDatabase db = mOpenHelper.getWritableDatabase();
         db.beginTransaction();
         try {
-            String account;
+            Account account;
             String authority;
             Cursor c = db.query("pending",
-                    new String[]{Sync.Pending.ACCOUNT, Sync.Pending.AUTHORITY},
+                    new String[]{Sync.Pending.ACCOUNT, Sync.Pending.ACCOUNT_TYPE,
+                            Sync.Pending.AUTHORITY},
                     "_id=" + rowId, null, null, null, null);
             try {
                 if (c.getCount() != 1) {
                     return 0;
                 }
                 c.moveToNext();
-                account = c.getString(0);
-                authority = c.getString(1);
+                String accountName = c.getString(0);
+                String accountType = c.getString(1);
+                account = new Account(accountName, accountType);
+                authority = c.getString(2);
             } finally {
                 c.close();
             }
             db.delete("pending", "_id=" + rowId, null /* no where args */);
-            final String[] accountAuthorityWhereArgs = new String[]{account, authority};
+            final String[] accountAuthorityWhereArgs =
+                    new String[]{account.mName, account.mType, authority};
             boolean isPending = 0 < DatabaseUtils.longForQuery(db,
-                    "SELECT COUNT(*) FROM PENDING WHERE account=? AND authority=?",
+                    "SELECT COUNT(*)"
+                            + " FROM PENDING"
+                            + " WHERE account=? AND account_type=? AND authority=?",
                     accountAuthorityWhereArgs);
             if (!isPending) {
                 long statsId = createStatsRowIfNecessary(account, authority);
@@ -581,7 +617,7 @@ public class SyncStorageEngine {
         return numDeletes > 0;
     }
 
-    public long insertStartSyncEvent(String account, String authority, long now, int source) {
+    public long insertStartSyncEvent(Account account, String authority, long now, int source) {
         SQLiteDatabase db = mOpenHelper.getWritableDatabase();
         long statsId = createStatsRowIfNecessary(account, authority);
 
@@ -731,14 +767,15 @@ public class SyncStorageEngine {
         }
     }
 
-    private long createStatsRowIfNecessary(String account, String authority) {
+    private long createStatsRowIfNecessary(Account account, String authority) {
         SQLiteDatabase db = mOpenHelper.getWritableDatabase();
         StringBuilder where = new StringBuilder();
         where.append(Sync.Stats.ACCOUNT + "= ?");
+        where.append(" and " + Sync.Stats.ACCOUNT_TYPE + "= ?");
         where.append(" and " + Sync.Stats.AUTHORITY + "= ?");
         Cursor cursor = query(Sync.Stats.CONTENT_URI,
                 Sync.Stats.SYNC_STATS_PROJECTION,
-                where.toString(), new String[] { account, authority },
+                where.toString(), new String[] { account.mName, account.mType, authority },
                 null /* order */);
         try {
             long id;
@@ -746,7 +783,8 @@ public class SyncStorageEngine {
                 id = cursor.getLong(cursor.getColumnIndexOrThrow(Sync.Stats._ID));
             } else {
                 ContentValues values = new ContentValues();
-                values.put(Sync.Stats.ACCOUNT, account);
+                values.put(Sync.Stats.ACCOUNT, account.mName);
+                values.put(Sync.Stats.ACCOUNT_TYPE, account.mType);
                 values.put(Sync.Stats.AUTHORITY, authority);
                 id = db.insert("stats", null, values);
             }
diff --git a/core/java/android/content/SyncableContentProvider.java b/core/java/android/content/SyncableContentProvider.java
index e0cd78643be6..93ebbeaac8fa 100644
--- a/core/java/android/content/SyncableContentProvider.java
+++ b/core/java/android/content/SyncableContentProvider.java
@@ -19,6 +19,7 @@ package android.content;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.net.Uri;
+import android.accounts.Account;
 
 import java.util.Map;
 
@@ -110,7 +111,7 @@ public abstract class SyncableContentProvider extends ContentProvider {
      * @param context the sync context for the operation
      * @param account
      */
-    public abstract void onSyncStart(SyncContext context, String account);
+    public abstract void onSyncStart(SyncContext context, Account account);
 
     /**
      * Called right after a sync is completed
@@ -124,7 +125,7 @@ public abstract class SyncableContentProvider extends ContentProvider {
      * The account of the most recent call to onSyncStart()
      * @return the account
      */
-    public abstract String getSyncingAccount();
+    public abstract Account getSyncingAccount();
 
     /**
      * Merge diffs from a sync source with this content provider.
@@ -194,7 +195,7 @@ public abstract class SyncableContentProvider extends ContentProvider {
      * Make sure that there are no entries for accounts that no longer exist
      * @param accountsArray the array of currently-existing accounts
      */
-    protected abstract void onAccountsChanged(String[] accountsArray);
+    protected abstract void onAccountsChanged(Account[] accountsArray);
 
     /**
      * A helper method to delete all rows whose account is not in the accounts
@@ -203,26 +204,24 @@ public abstract class SyncableContentProvider extends ContentProvider {
      *
      * @param accounts a map of existing accounts
      * @param table the table to delete from
-     * @param accountColumnName the name of the column that is expected
-     * to hold the account.
      */
-    protected abstract void deleteRowsForRemovedAccounts(Map<String, Boolean> accounts,
-            String table, String accountColumnName);
+    protected abstract void deleteRowsForRemovedAccounts(Map<Account, Boolean> accounts,
+            String table);
 
     /**
      * Called when the sync system determines that this provider should no longer
      * contain records for the specified account.
      */
-    public abstract void wipeAccount(String account);
+    public abstract void wipeAccount(Account account);
 
     /**
      * Retrieves the SyncData bytes for the given account. The byte array returned may be null.
      */
-    public abstract byte[] readSyncDataBytes(String account);
+    public abstract byte[] readSyncDataBytes(Account account);
 
     /**
      * Sets the SyncData bytes for the given account. The bytes array may be null.
      */
-    public abstract void writeSyncDataBytes(String account, byte[] data);
+    public abstract void writeSyncDataBytes(Account account, byte[] data);
 }
 
diff --git a/core/java/android/content/TempProviderSyncAdapter.java b/core/java/android/content/TempProviderSyncAdapter.java
index eb3a5da4a5b1..0cbe01e7e394 100644
--- a/core/java/android/content/TempProviderSyncAdapter.java
+++ b/core/java/android/content/TempProviderSyncAdapter.java
@@ -12,6 +12,7 @@ import android.util.Config;
 import android.util.EventLog;
 import android.util.Log;
 import android.util.TimingLogger;
+import android.accounts.Account;
 
 /**
  * @hide
@@ -67,7 +68,7 @@ public abstract class TempProviderSyncAdapter extends SyncAdapter {
      * @return true, if the sync was successfully started. One reason it can
      *   fail to start is if there is no user configured on the device.
      */
-    public abstract void onSyncStarting(SyncContext context, String account, boolean forced,
+    public abstract void onSyncStarting(SyncContext context, Account account, boolean forced,
             SyncResult result);
 
     /**
@@ -168,12 +169,12 @@ public abstract class TempProviderSyncAdapter extends SyncAdapter {
      * exist.
      * @param accounts the list of accounts
      */
-    public abstract void onAccountsChanged(String[] accounts);
+    public abstract void onAccountsChanged(Account[] accounts);
 
     private Context mContext;
 
     private class SyncThread extends Thread {
-        private final String mAccount;
+        private final Account mAccount;
         private final Bundle mExtras;
         private final SyncContext mSyncContext;
         private volatile boolean mIsCanceled = false;
@@ -181,7 +182,7 @@ public abstract class TempProviderSyncAdapter extends SyncAdapter {
         private long mInitialRxBytes;
         private final SyncResult mResult;
 
-        SyncThread(SyncContext syncContext, String account, Bundle extras) {
+        SyncThread(SyncContext syncContext, Account account, Bundle extras) {
             super("SyncThread");
             mAccount = account;
             mExtras = extras;
@@ -221,7 +222,7 @@ public abstract class TempProviderSyncAdapter extends SyncAdapter {
             }
         }
 
-        private void sync(SyncContext syncContext, String account, Bundle extras) {
+        private void sync(SyncContext syncContext, Account account, Bundle extras) {
             mIsCanceled = false;
 
             mProviderSyncStarted = false;
@@ -273,7 +274,7 @@ public abstract class TempProviderSyncAdapter extends SyncAdapter {
             }
         }
 
-        private void runSyncLoop(SyncContext syncContext, String account, Bundle extras) {
+        private void runSyncLoop(SyncContext syncContext, Account account, Bundle extras) {
             TimingLogger syncTimer = new TimingLogger(TAG + "Profiling", "sync");
             syncTimer.addSplit("start");
             int loopCount = 0;
@@ -518,7 +519,7 @@ public abstract class TempProviderSyncAdapter extends SyncAdapter {
         EventLog.writeEvent(SyncAdapter.LOG_SYNC_DETAILS, TAG, bytesSent, bytesReceived, "");
     }
 
-    public void startSync(SyncContext syncContext, String account, Bundle extras) {
+    public void startSync(SyncContext syncContext, Account account, Bundle extras) {
         if (mSyncThread != null) {
             syncContext.onFinished(SyncResult.ALREADY_IN_PROGRESS);
             return;
diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java
index 106c9200b680..ca579b6b501b 100644
--- a/core/java/android/hardware/Camera.java
+++ b/core/java/android/hardware/Camera.java
@@ -405,8 +405,6 @@ public class Camera {
      * @param params the Parameters to use for this Camera service
      */
     public void setParameters(Parameters params) {
-        Log.e(TAG, "setParameters()");
-        //params.dump();
         native_setParameters(params.flatten());
     }
 
@@ -416,7 +414,6 @@ public class Camera {
     public Parameters getParameters() {
         Parameters p = new Parameters();
         String s = native_getParameters();
-        Log.e(TAG, "_getParameters: " + s);
         p.unflatten(s);
         return p;
     }
diff --git a/core/java/android/net/MobileDataStateTracker.java b/core/java/android/net/MobileDataStateTracker.java
index ed7c0568353c..1064fb64fb94 100644
--- a/core/java/android/net/MobileDataStateTracker.java
+++ b/core/java/android/net/MobileDataStateTracker.java
@@ -354,9 +354,10 @@ public class MobileDataStateTracker extends NetworkStateTracker {
 
     /**
      * Tells the phone sub-system that the caller wants to
-     * begin using the named feature. The only supported feature at
-     * this time is {@code Phone.FEATURE_ENABLE_MMS}, which allows an application
-     * to specify that it wants to send and/or receive MMS data.
+     * begin using the named feature. The only supported features at
+     * this time are {@code Phone.FEATURE_ENABLE_MMS}, which allows an application
+     * to specify that it wants to send and/or receive MMS data, and
+     * {@code Phone.FEATURE_ENABLE_SUPL}, which is used for Assisted GPS.
      * @param feature the name of the feature to be used
      * @param callingPid the process ID of the process that is issuing this request
      * @param callingUid the user ID of the process that is issuing this request
@@ -376,6 +377,8 @@ public class MobileDataStateTracker extends NetworkStateTracker {
         if (TextUtils.equals(feature, Phone.FEATURE_ENABLE_MMS)) {
             mLastCallingPid = callingPid;
             return setEnableApn(Phone.APN_TYPE_MMS, true);
+        } else if (TextUtils.equals(feature, Phone.FEATURE_ENABLE_SUPL)) {
+            return setEnableApn(Phone.APN_TYPE_SUPL, true);
         } else {
             return -1;
         }
@@ -396,6 +399,8 @@ public class MobileDataStateTracker extends NetworkStateTracker {
     public int stopUsingNetworkFeature(String feature, int callingPid, int callingUid) {
         if (TextUtils.equals(feature, Phone.FEATURE_ENABLE_MMS)) {
             return setEnableApn(Phone.APN_TYPE_MMS, false);
+        } else if (TextUtils.equals(feature, Phone.FEATURE_ENABLE_SUPL)) {
+            return setEnableApn(Phone.APN_TYPE_SUPL, false);
         } else {
             return -1;
         }
diff --git a/core/java/android/net/Proxy.java b/core/java/android/net/Proxy.java
index 9f07c0a2c5b0..66eefb26af97 100644
--- a/core/java/android/net/Proxy.java
+++ b/core/java/android/net/Proxy.java
@@ -30,6 +30,9 @@ import junit.framework.Assert;
  */
 final public class Proxy {
 
+    // Set to true to enable extra debugging.
+    static final private boolean DEBUG = false;
+
     static final public String PROXY_CHANGE_ACTION =
         "android.intent.action.PROXY_CHANGE";
 
@@ -49,7 +52,7 @@ final public class Proxy {
         if (host != null) {
             int i = host.indexOf(':');
             if (i == -1) {
-                if (android.util.Config.DEBUG) {
+                if (DEBUG) {
                     Assert.assertTrue(host.length() == 0);
                 }
                 return null;
@@ -73,12 +76,12 @@ final public class Proxy {
         if (host != null) {
             int i = host.indexOf(':');
             if (i == -1) {
-                if (android.util.Config.DEBUG) {
+                if (DEBUG) {
                     Assert.assertTrue(host.length() == 0);
                 }
                 return -1;
             }
-            if (android.util.Config.DEBUG) {
+            if (DEBUG) {
                 Assert.assertTrue(i < host.length());
             }
             return Integer.parseInt(host.substring(i+1));
diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java
index 0e9102f88da6..39d36de7e3fe 100644
--- a/core/java/android/os/BatteryStats.java
+++ b/core/java/android/os/BatteryStats.java
@@ -89,7 +89,7 @@ public abstract class BatteryStats implements Parcelable {
     /**
      * Bump the version on this if the checkin format changes.
      */
-    private static final int BATTERY_STATS_CHECKIN_VERSION = 4;
+    private static final int BATTERY_STATS_CHECKIN_VERSION = 5;
     
     private static final long BYTES_PER_KB = 1024;
     private static final long BYTES_PER_MB = 1048576; // 1024^2
@@ -100,6 +100,7 @@ public abstract class BatteryStats implements Parcelable {
     private static final String PROCESS_DATA = "pr";
     private static final String SENSOR_DATA = "sr";
     private static final String WAKELOCK_DATA = "wl";
+    private static final String KERNEL_WAKELOCK_DATA = "kwl";
     private static final String NETWORK_DATA = "nt";
     private static final String USER_ACTIVITY_DATA = "ua";
     private static final String BATTERY_DATA = "bt";
@@ -126,7 +127,7 @@ public abstract class BatteryStats implements Parcelable {
          *
          * @param which one of STATS_TOTAL, STATS_LAST, or STATS_CURRENT
          */
-        public abstract int getCount(int which);
+        public abstract int getCountLocked(int which);
 
         /**
          * Temporary for debugging.
@@ -145,7 +146,7 @@ public abstract class BatteryStats implements Parcelable {
          *
          * @param which one of STATS_TOTAL, STATS_LAST, or STATS_CURRENT
          */
-        public abstract int getCount(int which);
+        public abstract int getCountLocked(int which);
 
         /**
          * Returns the total time in microseconds associated with this Timer for the
@@ -155,7 +156,7 @@ public abstract class BatteryStats implements Parcelable {
          * @param which one of STATS_TOTAL, STATS_LAST, or STATS_CURRENT
          * @return a time in microseconds
          */
-        public abstract long getTotalTime(long batteryRealtime, int which);
+        public abstract long getTotalTimeLocked(long batteryRealtime, int which);
         
         /**
          * Temporary for debugging.
@@ -518,6 +519,8 @@ public abstract class BatteryStats implements Parcelable {
      * @param which one of STATS_TOTAL, STATS_LAST, or STATS_CURRENT.
      */
     public abstract long computeRealtime(long curTime, int which);
+    
+    public abstract Map<String, ? extends Timer> getKernelWakelockStats();
 
     private final static void formatTime(StringBuilder out, long seconds) {
         long days = seconds / (60 * 60 * 24);
@@ -607,14 +610,14 @@ public abstract class BatteryStats implements Parcelable {
         
         if (timer != null) {
             // Convert from microseconds to milliseconds with rounding
-            long totalTimeMicros = timer.getTotalTime(batteryRealtime, which);
+            long totalTimeMicros = timer.getTotalTimeLocked(batteryRealtime, which);
             long totalTimeMillis = (totalTimeMicros + 500) / 1000;
             
-            int count = timer.getCount(which);
+            int count = timer.getCountLocked(which);
             if (totalTimeMillis != 0) {
                 sb.append(linePrefix);
                 sb.append(formatTimeMs(totalTimeMillis));
-                sb.append(name);
+                sb.append(name != null ? name : "");
                 sb.append(' ');
                 sb.append('(');
                 sb.append(count);
@@ -637,18 +640,17 @@ public abstract class BatteryStats implements Parcelable {
      * @return the line prefix
      */
     private static final String printWakeLockCheckin(StringBuilder sb, Timer timer, long now,
-        String name, int which, String linePrefix) {
+            String name, int which, String linePrefix) {
         long totalTimeMicros = 0;
         int count = 0;
         if (timer != null) {
-            totalTimeMicros = timer.getTotalTime(now, which);
-            count = timer.getCount(which); 
+            totalTimeMicros = timer.getTotalTimeLocked(now, which);
+            count = timer.getCountLocked(which); 
         }
         sb.append(linePrefix);
         sb.append((totalTimeMicros + 500) / 1000); // microseconds to milliseconds with rounding
         sb.append(',');
-        sb.append(name);
-        sb.append(',');
+        sb.append(name != null ? name + "," : "");
         sb.append(count);
         return ",";
     }
@@ -730,12 +732,12 @@ public abstract class BatteryStats implements Parcelable {
                     
                     Timer fullWakeTimer = wl.getWakeTime(WAKE_TYPE_FULL);
                     if (fullWakeTimer != null) {
-                        fullWakeLockTimeTotal += fullWakeTimer.getTotalTime(batteryRealtime, which);
+                        fullWakeLockTimeTotal += fullWakeTimer.getTotalTimeLocked(batteryRealtime, which);
                     }
 
                     Timer partialWakeTimer = wl.getWakeTime(WAKE_TYPE_PARTIAL);
                     if (partialWakeTimer != null) {
-                        partialWakeLockTimeTotal += partialWakeTimer.getTotalTime(
+                        partialWakeLockTimeTotal += partialWakeTimer.getTotalTimeLocked(
                             batteryRealtime, which);
                     }
                 }
@@ -783,6 +785,17 @@ public abstract class BatteryStats implements Parcelable {
                     getDischargeCurrentLevel());
         }
         
+        Map<String, ? extends BatteryStats.Timer> kernelWakelocks = getKernelWakelockStats();
+        if (kernelWakelocks.size() > 0) {
+            for (Map.Entry<String, ? extends BatteryStats.Timer> ent : kernelWakelocks.entrySet()) {
+                sb.setLength(0);
+                printWakeLockCheckin(sb, ent.getValue(), batteryRealtime, null, which, "");
+
+                dumpLine(pw, 0 /* uid */, category, KERNEL_WAKELOCK_DATA, ent.getKey(), 
+                        sb.toString());
+            }
+        }
+        
         for (int iu = 0; iu < NU; iu++) {
             final int uid = uidStats.keyAt(iu);
             Uid u = uidStats.valueAt(iu);
@@ -821,12 +834,12 @@ public abstract class BatteryStats implements Parcelable {
                     Uid.Wakelock wl = ent.getValue();
                     String linePrefix = "";
                     sb.setLength(0);
-                    linePrefix = printWakeLockCheckin(sb, wl.getWakeTime(WAKE_TYPE_FULL), batteryRealtime,
-                            "f", which, linePrefix);
-                    linePrefix = printWakeLockCheckin(sb, wl.getWakeTime(WAKE_TYPE_PARTIAL), batteryRealtime,
-                            "p", which, linePrefix);
-                    linePrefix = printWakeLockCheckin(sb, wl.getWakeTime(WAKE_TYPE_WINDOW), batteryRealtime,
-                            "w", which, linePrefix);
+                    linePrefix = printWakeLockCheckin(sb, wl.getWakeTime(WAKE_TYPE_FULL), 
+                            batteryRealtime, "f", which, linePrefix);
+                    linePrefix = printWakeLockCheckin(sb, wl.getWakeTime(WAKE_TYPE_PARTIAL), 
+                            batteryRealtime, "p", which, linePrefix);
+                    linePrefix = printWakeLockCheckin(sb, wl.getWakeTime(WAKE_TYPE_WINDOW), 
+                            batteryRealtime, "w", which, linePrefix);
                     
                     // Only log if we had at lease one wakelock...
                     if (sb.length() > 0) {
@@ -844,8 +857,8 @@ public abstract class BatteryStats implements Parcelable {
                     Timer timer = se.getSensorTime();
                     if (timer != null) {
                         // Convert from microseconds to milliseconds with rounding
-                        long totalTime = (timer.getTotalTime(batteryRealtime, which) + 500) / 1000;
-                        int count = timer.getCount(which);
+                        long totalTime = (timer.getTotalTimeLocked(batteryRealtime, which) + 500) / 1000;
+                        int count = timer.getCountLocked(which);
                         if (totalTime != 0) {
                             dumpLine(pw, uid, category, SENSOR_DATA, sensorNumber, totalTime, count);
                         }
@@ -971,6 +984,26 @@ public abstract class BatteryStats implements Parcelable {
         long fullWakeLockTimeTotalMicros = 0;
         long partialWakeLockTimeTotalMicros = 0;
         
+        Map<String, ? extends BatteryStats.Timer> kernelWakelocks = getKernelWakelockStats();
+        if (kernelWakelocks.size() > 0) {
+            for (Map.Entry<String, ? extends BatteryStats.Timer> ent : kernelWakelocks.entrySet()) {
+                
+                String linePrefix = ": ";
+                sb.setLength(0);
+                sb.append(prefix);
+                sb.append("  Kernel Wake lock ");
+                sb.append(ent.getKey());
+                linePrefix = printWakeLock(sb, ent.getValue(), batteryRealtime, null, which, 
+                        linePrefix);
+                if (!linePrefix.equals(": ")) {
+                    sb.append(" realtime");
+                } else {
+                    sb.append(": (nothing executed)");
+                }
+                pw.println(sb.toString());
+            }
+        }
+    
         for (int iu = 0; iu < NU; iu++) {
             Uid u = uidStats.valueAt(iu);
             rxTotal += u.getTcpBytesReceived(which);
@@ -984,13 +1017,13 @@ public abstract class BatteryStats implements Parcelable {
                     
                     Timer fullWakeTimer = wl.getWakeTime(WAKE_TYPE_FULL);
                     if (fullWakeTimer != null) {
-                        fullWakeLockTimeTotalMicros += fullWakeTimer.getTotalTime(
+                        fullWakeLockTimeTotalMicros += fullWakeTimer.getTotalTimeLocked(
                                 batteryRealtime, which);
                     }
 
                     Timer partialWakeTimer = wl.getWakeTime(WAKE_TYPE_PARTIAL);
                     if (partialWakeTimer != null) {
-                        partialWakeLockTimeTotalMicros += partialWakeTimer.getTotalTime(
+                        partialWakeLockTimeTotalMicros += partialWakeTimer.getTotalTimeLocked(
                                 batteryRealtime, which);
                     }
                 }
@@ -1179,8 +1212,9 @@ public abstract class BatteryStats implements Parcelable {
                     Timer timer = se.getSensorTime();
                     if (timer != null) {
                         // Convert from microseconds to milliseconds with rounding
-                        long totalTime = (timer.getTotalTime(batteryRealtime, which) + 500) / 1000;
-                        int count = timer.getCount(which);
+                        long totalTime = (timer.getTotalTimeLocked(
+                                batteryRealtime, which) + 500) / 1000;
+                        int count = timer.getCountLocked(which);
                         //timer.logState();
                         if (totalTime != 0) {
                             sb.append(formatTimeMs(totalTime));
diff --git a/core/java/android/os/Process.java b/core/java/android/os/Process.java
index cd86fbe70dac..e4412a34f764 100644
--- a/core/java/android/os/Process.java
+++ b/core/java/android/os/Process.java
@@ -680,6 +680,8 @@ public class Process {
     /** @hide */
     public static final int PROC_SPACE_TERM = (int)' ';
     /** @hide */
+    public static final int PROC_TAB_TERM = (int)'\t';
+    /** @hide */
     public static final int PROC_COMBINE = 0x100;
     /** @hide */
     public static final int PROC_PARENS = 0x200;
@@ -693,6 +695,10 @@ public class Process {
     /** @hide */
     public static final native boolean readProcFile(String file, int[] format,
             String[] outStrings, long[] outLongs, float[] outFloats);
+    
+    /** @hide */
+    public static final native boolean parseProcLine(byte[] buffer, int startIndex, 
+            int endIndex, int[] format, String[] outStrings, long[] outLongs, float[] outFloats);
 
     /**
      * Gets the total Pss value for a given process, in bytes.
diff --git a/core/java/android/provider/Calendar.java b/core/java/android/provider/Calendar.java
index 4a709f6c7517..3a221e436c01 100644
--- a/core/java/android/provider/Calendar.java
+++ b/core/java/android/provider/Calendar.java
@@ -32,6 +32,7 @@ import android.text.format.DateUtils;
 import android.text.format.Time;
 import android.util.Config;
 import android.util.Log;
+import android.accounts.Account;
 import com.android.internal.database.ArrayListCursor;
 import com.google.android.gdata.client.AndroidGDataClient;
 import com.google.android.gdata.client.AndroidXmlParserFactory;
@@ -157,11 +158,12 @@ public final class Calendar {
          * @param account the account whose rows should be deleted
          * @return the count of rows that were deleted
          */
-        public static int deleteCalendarsForAccount(ContentResolver cr,
-                String account) {
+        public static int deleteCalendarsForAccount(ContentResolver cr, Account account) {
             // delete all calendars that match this account
-            return Calendar.Calendars.delete(cr, Calendar.Calendars._SYNC_ACCOUNT + "=?",
-                    new String[] {account});
+            return Calendar.Calendars.delete(cr,
+                    Calendar.Calendars._SYNC_ACCOUNT + "=? AND "
+                            + Calendar.Calendars._SYNC_ACCOUNT_TYPE + "=?",
+                    new String[] {account.mName, account.mType});
         }
 
         /**
diff --git a/core/java/android/provider/Contacts.java b/core/java/android/provider/Contacts.java
index 064ed88edb89..a6450f3c5299 100644
--- a/core/java/android/provider/Contacts.java
+++ b/core/java/android/provider/Contacts.java
@@ -30,6 +30,7 @@ import android.net.Uri;
 import android.text.TextUtils;
 import android.util.Log;
 import android.widget.ImageView;
+import android.accounts.Account;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
@@ -75,6 +76,12 @@ public class Contacts {
         public static final String _SYNC_ACCOUNT = "_sync_account";
 
         /**
+         * The _SYNC_ACCOUNT_TYPE to which this setting corresponds. This may be null.
+         * <P>Type: TEXT</P>
+         */
+        public static final String _SYNC_ACCOUNT_TYPE = "_sync_account_type";
+
+        /**
          * The key of this setting.
          * <P>Type: TEXT</P>
          */
@@ -134,6 +141,7 @@ public class Contacts {
                 selectString = (account == null)
                         ? "_sync_account is null AND key=?"
                         : "_sync_account=? AND key=?";
+//                : "_sync_account=? AND _sync_account_type=? AND key=?";
                 selectArgs = (account == null)
                 ? new String[]{key}
                 : new String[]{account, key};
@@ -158,7 +166,8 @@ public class Contacts {
             // the account name is, so we're using a global setting for SYNC_EVERYTHING.
             // Some day when we add multiple accounts to the UI this should honor the account
             // that was asked for.
-            //values.put(_SYNC_ACCOUNT, account);
+            //values.put(_SYNC_ACCOUNT, account.mName);
+            //values.put(_SYNC_ACCOUNT_TYPE, account.mType);
             values.put(KEY, key);
             values.put(VALUE, value);
             cr.update(Settings.CONTENT_URI, values, null, null);
@@ -840,6 +849,12 @@ public class Contacts {
         public static final String GROUP_SYNC_ACCOUNT = "group_sync_account";
 
         /**
+         * The account type of the group.
+         * <P>Type: TEXT</P>
+         */
+        public static final String GROUP_SYNC_ACCOUNT_TYPE = "group_sync_account_type";
+
+        /**
          * The row id of the person.
          * <P>Type: TEXT</P>
          */
diff --git a/core/java/android/provider/Gmail.java b/core/java/android/provider/Gmail.java
index cc039686249d..c4b29ae440fa 100644
--- a/core/java/android/provider/Gmail.java
+++ b/core/java/android/provider/Gmail.java
@@ -38,7 +38,6 @@ import android.text.TextUtils;
 import android.text.TextUtils.SimpleStringSplitter;
 import android.text.style.CharacterStyle;
 import android.text.util.Regex;
-import android.util.Config;
 import android.util.Log;
 
 import java.io.UnsupportedEncodingException;
@@ -61,6 +60,9 @@ import java.util.regex.Pattern;
  * @hide
  */
 public final class Gmail {
+    // Set to true to enable extra debugging.
+    private static final boolean DEBUG = false;
+
     public static final String GMAIL_AUTH_SERVICE = "mail";
     // These constants come from google3/java/com/google/caribou/backend/MailLabel.java.
     public static final String LABEL_SENT = "^f";
@@ -1195,7 +1197,7 @@ public final class Gmail {
 
         @Override
         public void onChange(boolean selfChange) {
-            if (Config.DEBUG) {
+            if (DEBUG) {
                 Log.d(TAG, "MailCursor is notifying " + mObservers.size() + " observers");
             }
             for (MailCursorObserver o: mObservers) {
diff --git a/core/java/android/provider/SubscribedFeeds.java b/core/java/android/provider/SubscribedFeeds.java
index 4d430d5fd91a..f94b4427bd28 100644
--- a/core/java/android/provider/SubscribedFeeds.java
+++ b/core/java/android/provider/SubscribedFeeds.java
@@ -20,6 +20,7 @@ import android.content.ContentResolver;
 import android.content.ContentValues;
 import android.database.Cursor;
 import android.net.Uri;
+import android.accounts.Account;
 
 /**
  * The SubscribedFeeds provider stores all information about subscribed feeds.
@@ -99,7 +100,7 @@ public class SubscribedFeeds {
         /**
          * The default sort order for this table
          */
-        public static final String DEFAULT_SORT_ORDER = "_SYNC_ACCOUNT ASC";
+        public static final String DEFAULT_SORT_ORDER = "_SYNC_ACCOUNT_TYPE, _SYNC_ACCOUNT ASC";
     }
 
     /**
@@ -114,38 +115,36 @@ public class SubscribedFeeds {
      * @return  the Uri of the feed that was added
      */
     public static Uri addFeed(ContentResolver resolver,
-            String feed, String account,
+            String feed, Account account,
             String authority, String service) {
         ContentValues values = new ContentValues();
         values.put(SubscribedFeeds.Feeds.FEED, feed);
-        values.put(SubscribedFeeds.Feeds._SYNC_ACCOUNT, account);
+        values.put(SubscribedFeeds.Feeds._SYNC_ACCOUNT, account.mName);
+        values.put(SubscribedFeeds.Feeds._SYNC_ACCOUNT_TYPE, account.mType);
         values.put(SubscribedFeeds.Feeds.AUTHORITY, authority);
         values.put(SubscribedFeeds.Feeds.SERVICE, service);
         return resolver.insert(SubscribedFeeds.Feeds.CONTENT_URI, values);
     }
 
     public static int deleteFeed(ContentResolver resolver,
-            String feed, String account, String authority) {
+            String feed, Account account, String authority) {
         StringBuilder where = new StringBuilder();
         where.append(SubscribedFeeds.Feeds._SYNC_ACCOUNT + "=?");
+        where.append(" AND " + SubscribedFeeds.Feeds._SYNC_ACCOUNT_TYPE + "=?");
         where.append(" AND " + SubscribedFeeds.Feeds.FEED + "=?");
         where.append(" AND " + SubscribedFeeds.Feeds.AUTHORITY + "=?");
         return resolver.delete(SubscribedFeeds.Feeds.CONTENT_URI,
-                where.toString(), new String[] {account, feed, authority});
+                where.toString(), new String[] {account.mName, account.mType, feed, authority});
     }
 
     public static int deleteFeeds(ContentResolver resolver,
-            String account, String authority) {
+            Account account, String authority) {
         StringBuilder where = new StringBuilder();
         where.append(SubscribedFeeds.Feeds._SYNC_ACCOUNT + "=?");
+        where.append(" AND " + SubscribedFeeds.Feeds._SYNC_ACCOUNT_TYPE + "=?");
         where.append(" AND " + SubscribedFeeds.Feeds.AUTHORITY + "=?");
         return resolver.delete(SubscribedFeeds.Feeds.CONTENT_URI,
-                where.toString(), new String[] {account, authority});
-    }
-
-    public static String gtalkServiceRoutingInfoFromAccountAndResource(
-            String account, String res) {
-        return Uri.parse("gtalk://" + account + "/" + res).toString();
+                where.toString(), new String[] {account.mName, account.mType, authority});
     }
 
     /**
@@ -157,6 +156,12 @@ public class SubscribedFeeds {
          * <P>Type: TEXT</P>
          */
         public static final String _SYNC_ACCOUNT = SyncConstValue._SYNC_ACCOUNT;
+
+        /**
+         * The account type.
+         * <P>Type: TEXT</P>
+         */
+        public static final String _SYNC_ACCOUNT_TYPE = SyncConstValue._SYNC_ACCOUNT_TYPE;
     }
 
     /**
@@ -199,6 +204,6 @@ public class SubscribedFeeds {
         /**
          * The default sort order for this table
          */
-        public static final String DEFAULT_SORT_ORDER = "_SYNC_ACCOUNT ASC";
+        public static final String DEFAULT_SORT_ORDER = "_SYNC_ACCOUNT_TYPE, _SYNC_ACCOUNT ASC";
     }
 }
diff --git a/core/java/android/provider/Sync.java b/core/java/android/provider/Sync.java
index 628852f4c37c..c9bde0e4a1f9 100644
--- a/core/java/android/provider/Sync.java
+++ b/core/java/android/provider/Sync.java
@@ -22,6 +22,8 @@ import android.content.ContentValues;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Handler;
+import android.accounts.Account;
+import android.text.TextUtils;
 
 import java.util.Map;
 
@@ -51,6 +53,12 @@ public final class Sync {
         public static final String ACCOUNT = "account";
 
         /**
+         * The sync account type.
+         * <P>Type: TEXT</P>
+         */
+        public static final String ACCOUNT_TYPE = "account_type";
+
+        /**
          * The content authority (contacts, calendar, etc.).
          * <P>Type: TEXT</P>
          */
@@ -280,7 +288,8 @@ public final class Sync {
         public static final String MESG_CANCELED = "canceled";
 
         private static final String FINISHED_SINCE_WHERE_CLAUSE = EVENT + "=" + EVENT_STOP
-                + " AND " + EVENT_TIME + ">? AND " + ACCOUNT + "=? AND " + AUTHORITY + "=?";
+                + " AND " + EVENT_TIME + ">? AND " + ACCOUNT + "=? AND " + ACCOUNT_TYPE + "=?"
+                + " AND " + AUTHORITY + "=?";
 
         public static String mesgToString(String mesg) {
             if (MESG_SUCCESS.equals(mesg)) return mesg;
@@ -311,10 +320,11 @@ public final class Sync {
         }
 
         public static boolean hasNewerSyncFinished(ContentResolver contentResolver,
-                String account, String authority, long when) {
+                Account account, String authority, long when) {
             Cursor c = contentResolver.query(CONTENT_URI, new String[]{_ID},
                     FINISHED_SINCE_WHERE_CLAUSE,
-                    new String[]{Long.toString(when), account, authority}, null);
+                    new String[]{Long.toString(when), account.mName, account.mType, authority},
+                    null);
             try {
               return c.getCount() > 0;
             } finally {
@@ -345,7 +355,8 @@ public final class Sync {
          * @return the cursor on the AuthorityHistory table
          */
         public static Cursor query(ContentResolver contentResolver) {
-            return contentResolver.query(CONTENT_URI, null, null, null, ACCOUNT + ", " + AUTHORITY);
+            return contentResolver.query(CONTENT_URI, null, null, null,
+                    ACCOUNT_TYPE + "," + ACCOUNT + "," + AUTHORITY);
         }
 
         public static class QueryMap extends ContentQueryMap {
@@ -356,10 +367,11 @@ public final class Sync {
                         _ID, keepUpdated, handlerForUpdateNotifications);
             }
 
-            public ContentValues get(String account, String authority) {
+            public ContentValues get(Account account, String authority) {
                 Map<String, ContentValues> rows = getRows();
                 for (ContentValues values : rows.values()) {
-                    if (values.getAsString(ACCOUNT).equals(account)
+                    if (values.getAsString(ACCOUNT).equals(account.mName)
+                            && values.getAsString(ACCOUNT_TYPE).equals(account.mType)
                             && values.getAsString(AUTHORITY).equals(authority)) {
                         return values;
                     }
@@ -390,10 +402,11 @@ public final class Sync {
                         handlerForUpdateNotifications);
             }
 
-            public boolean isPending(String account, String authority) {
+            public boolean isPending(Account account, String authority) {
                 Map<String, ContentValues> rows = getRows();
                 for (ContentValues values : rows.values()) {
-                    if (values.getAsString(ACCOUNT).equals(account)
+                    if (values.getAsString(ACCOUNT).equals(account.mName)
+                            && values.getAsString(ACCOUNT_TYPE).equals(account.mType)
                             && values.getAsString(AUTHORITY).equals(authority)) {
                         return true;
                     }
@@ -444,9 +457,12 @@ public final class Sync {
                 return null;
             }
 
-            public String getSyncingAccount() {
+            public Account getSyncingAccount() {
                 ContentValues values = getActiveSyncInfo();
-                return (values == null) ? null : values.getAsString(ACCOUNT);
+                if (values == null || TextUtils.isEmpty(values.getAsString(ACCOUNT))) {
+                    return null;
+                }
+                return new Account(values.getAsString(ACCOUNT), values.getAsString(ACCOUNT_TYPE));
             }
 
             public String getSyncingAuthority() {
diff --git a/core/java/android/provider/SyncConstValue.java b/core/java/android/provider/SyncConstValue.java
index 6eb4398444de..30966eb6f63d 100644
--- a/core/java/android/provider/SyncConstValue.java
+++ b/core/java/android/provider/SyncConstValue.java
@@ -29,6 +29,12 @@ public interface SyncConstValue
     public static final String _SYNC_ACCOUNT = "_sync_account";
 
     /**
+     * The type of the account that was used to sync the entry to the device.
+     * <P>Type: TEXT</P>
+     */
+    public static final String _SYNC_ACCOUNT_TYPE = "_sync_account_type";
+
+    /**
      * The unique ID for a row assigned by the sync source. NULL if the row has never been synced.
      * <P>Type: TEXT</P>
      */
@@ -68,4 +74,9 @@ public interface SyncConstValue
      * Used to indicate that this account is not synced
      */
     public static final String NON_SYNCABLE_ACCOUNT = "non_syncable";
+
+    /**
+     * Used to indicate that this account is not synced
+     */
+    public static final String NON_SYNCABLE_ACCOUNT_TYPE = "android.local";
 }
diff --git a/core/java/android/speech/IRecognitionListener.aidl b/core/java/android/speech/IRecognitionListener.aidl
new file mode 100644
index 000000000000..6ed32b502b42
--- /dev/null
+++ b/core/java/android/speech/IRecognitionListener.aidl
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.speech;
+
+import android.os.Bundle;
+
+/**
+ * Listener for speech recognition events, used with RecognitionService.
+ *  This gives you both the final recognition results, as well as various
+ *  intermediate events that can be used to show visual feedback to the user.
+ *  {@hide}
+ */
+interface IRecognitionListener {
+    /** Called when the endpointer is ready for the user to start speaking. */
+    void onReadyForSpeech(in Bundle noiseParams);
+
+    /** The user has started to speak. */
+    void onBeginningOfSpeech();
+
+    /** The sound level in the audio stream has changed. */
+    void onRmsChanged(in float rmsdB);
+
+    /**
+     * More sound has been received. Buffer is a byte buffer containing
+     * a sequence of 16-bit shorts. 
+     */
+    void onBufferReceived(in byte[] buffer);
+
+    /** Called after the user stops speaking. */
+    void onEndOfSpeech();
+
+    /** A network or recognition error occurred. */
+    void onError(in String error);
+
+    /** 
+     * Called when recognition transcripts are ready.
+     * results: an ordered list of the most likely transcripts (N-best list).
+     * @hide
+     */
+    void onResults(in List<String> results);
+}
diff --git a/core/java/android/speech/IRecognitionService.aidl b/core/java/android/speech/IRecognitionService.aidl
new file mode 100644
index 000000000000..8f069769cf83
--- /dev/null
+++ b/core/java/android/speech/IRecognitionService.aidl
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.speech;
+
+import android.os.Bundle;
+import android.speech.IRecognitionListener;
+
+// A Service interface to speech recognition. Call startListening when
+// you want to begin capturing audio; RecognitionService will automatically
+// determine when the user has finished speaking, stream the audio to the
+// recognition servers, and notify you when results are ready.
+/** {@hide} */
+interface IRecognitionService {
+    // Start listening for speech. Can only call this from one thread at once.
+    void startListening(in Bundle recognitionParams,
+        in IRecognitionListener listener);
+
+    void cancel();
+}
diff --git a/core/java/android/speech/RecognitionServiceUtil.java b/core/java/android/speech/RecognitionServiceUtil.java
new file mode 100644
index 000000000000..650c0fd24881
--- /dev/null
+++ b/core/java/android/speech/RecognitionServiceUtil.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright (C) 2009 Google Inc.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package android.speech;
+
+import android.content.ComponentName;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.os.Bundle;
+import android.os.IBinder;
+
+import java.util.List;
+
+/**
+ * Utils for Google's network-based speech recognizer, which lets you perform
+ * speech-to-text translation through RecognitionService. IRecognitionService
+ * and IRecognitionListener are the core interfaces; you begin recognition
+ * through IRecognitionService and subscribe to callbacks about when the user
+ * stopped speaking, results come in, errors, etc. through IRecognitionListener.
+ * RecognitionServiceUtil includes default IRecognitionListener and
+ * ServiceConnection implementations to reduce the amount of boilerplate.
+ *
+ * The Service provides no user interface. See RecognitionActivity if you
+ * want the standard voice search UI.
+ *
+ * Below is a small skeleton of how to use the recognizer:
+ *
+ * ServiceConnection conn = new RecognitionServiceUtil.Connection();
+ * mContext.bindService(RecognitionServiceUtil.sDefaultIntent,
+ *     conn, Context.BIND_AUTO_CREATE);
+ * IRecognitionListener listener = new RecognitionServiceWrapper.NullListener() {
+ *         public void onResults(List<String> results) {
+ *             // Do something with recognition transcripts
+ *         }
+ *     }
+ *
+ * // Must wait for conn.mService to be populated, then call below
+ * conn.mService.startListening(null, listener);
+ *
+ * {@hide}
+ */
+public class RecognitionServiceUtil {
+    public static final Intent sDefaultIntent = new Intent(
+            RecognizerIntent.ACTION_RECOGNIZE_SPEECH);
+
+    public static final String NOISE_LEVEL = "NoiseLevel";
+    public static final String SIGNAL_NOISE_RATIO = "SignalNoiseRatio";
+
+    private RecognitionServiceUtil() {}
+
+    /**
+     * IRecognitionListener which does nothing in response to recognition
+     * callbacks. You can subclass from this and override only the methods
+     * whose events you want to respond to.
+     */
+    public static class NullListener extends IRecognitionListener.Stub {
+        public void onReadyForSpeech(Bundle bundle) {}
+        public void onBeginningOfSpeech() {}
+        public void onRmsChanged(float rmsdB) {}
+        public void onBufferReceived(byte[] buf) {}
+        public void onEndOfSpeech() {}
+        public void onError(String error) {}
+        public void onResults(List<String> results) {}
+    }
+
+    /**
+     * Basic ServiceConnection which just records mService variable.
+     */
+    public static class Connection implements ServiceConnection {
+        public IRecognitionService mService;
+
+        public synchronized void onServiceConnected(ComponentName name, IBinder service) {
+            mService = IRecognitionService.Stub.asInterface(service);
+        }
+
+        public void onServiceDisconnected(ComponentName name) {
+            mService = null;
+        }
+    }
+}
diff --git a/core/java/android/test/InstrumentationTestCase.java b/core/java/android/test/InstrumentationTestCase.java
index 82f2ef9dd8eb..470ab0d9a48e 100644
--- a/core/java/android/test/InstrumentationTestCase.java
+++ b/core/java/android/test/InstrumentationTestCase.java
@@ -62,6 +62,10 @@ public class InstrumentationTestCase extends TestCase {
      *  action = {@link Intent#ACTION_MAIN}
      *  extras = null, unless a custom bundle is provided here
      * All other fields are null or empty.
+     * 
+     * <p><b>NOTE:</b> The parameter <i>pkg</i> must refer to the package identifier of the
+     * package hosting the activity to be launched, which is specified in the AndroidManifest.xml
+     * file.  This is not necessarily the same as the java package name.
      *
      * @param pkg The package hosting the activity to be launched.
      * @param activityCls The activity class to launch.
@@ -82,6 +86,11 @@ public class InstrumentationTestCase extends TestCase {
 
     /**
      * Utility method for launching an activity with a specific Intent.
+     * 
+     * <p><b>NOTE:</b> The parameter <i>pkg</i> must refer to the package identifier of the
+     * package hosting the activity to be launched, which is specified in the AndroidManifest.xml
+     * file.  This is not necessarily the same as the java package name.
+     *
      * @param pkg The package hosting the activity to be launched.
      * @param activityCls The activity class to launch.
      * @param intent The intent to launch with
diff --git a/core/java/android/text/Layout.java b/core/java/android/text/Layout.java
index a6ed922f89fe..29dc2ea5246e 100644
--- a/core/java/android/text/Layout.java
+++ b/core/java/android/text/Layout.java
@@ -24,7 +24,6 @@ import android.graphics.Rect;
 import android.graphics.RectF;
 import android.graphics.Path;
 import com.android.internal.util.ArrayUtils;
-import android.util.Config;
 
 import junit.framework.Assert;
 import android.text.style.*;
@@ -39,6 +38,8 @@ import android.view.KeyEvent;
  * For text that will not change, use a {@link StaticLayout}.
  */
 public abstract class Layout {
+    private static final boolean DEBUG = false;
+
     /* package */ static final EmojiFactory EMOJI_FACTORY =
         EmojiFactory.newAvailableInstance();
     /* package */ static final int MIN_EMOJI, MAX_EMOJI;
@@ -330,7 +331,7 @@ public abstract class Layout {
             boolean hasTab = getLineContainsTab(i);
             if (directions == DIRS_ALL_LEFT_TO_RIGHT &&
                     !spannedText && !hasTab) {
-                if (Config.DEBUG) {
+                if (DEBUG) {
                     Assert.assertTrue(dir == DIR_LEFT_TO_RIGHT);
                     Assert.assertNotNull(c);
                 }
@@ -797,7 +798,7 @@ public abstract class Layout {
     }
     
     private int getLineVisibleEnd(int line, int start, int end) {
-        if (Config.DEBUG) {
+        if (DEBUG) {
             Assert.assertTrue(getLineStart(line) == start && getLineStart(line+1) == end);
         }
 
@@ -1340,7 +1341,7 @@ public abstract class Layout {
         char[] buf;
         if (!hasTabs) {
             if (directions == DIRS_ALL_LEFT_TO_RIGHT) {
-                if (Config.DEBUG) {
+                if (DEBUG) {
                     Assert.assertTrue(DIR_LEFT_TO_RIGHT == dir);
                 }
                 Styled.drawText(canvas, text, start, end, dir, false, x, top, y, bottom, paint, workPaint, false);
diff --git a/core/java/android/util/DebugUtils.java b/core/java/android/util/DebugUtils.java
index 1c5d669ad52a..56f389c9faa9 100644
--- a/core/java/android/util/DebugUtils.java
+++ b/core/java/android/util/DebugUtils.java
@@ -43,8 +43,8 @@ public class DebugUtils {
      *
      * <p>This class is useful for debugging and logging purpose:</p>
      * <pre>
-     * if (Config.DEBUG) {
-     *   if (DebugUtils.isObjectSelected(childView) && Config.LOGV) {
+     * if (DEBUG) {
+     *   if (DebugUtils.isObjectSelected(childView) && LOGV_ENABLED) {
      *     Log.v(TAG, "Object " + childView + " logged!");
      *   }
      * }
diff --git a/core/java/android/webkit/BrowserFrame.java b/core/java/android/webkit/BrowserFrame.java
index 5401a6e0af12..ba3f78cf22ec 100644
--- a/core/java/android/webkit/BrowserFrame.java
+++ b/core/java/android/webkit/BrowserFrame.java
@@ -24,7 +24,6 @@ import android.net.WebAddress;
 import android.net.http.SslCertificate;
 import android.os.Handler;
 import android.os.Message;
-import android.util.Config;
 import android.util.Log;
 import android.util.TypedValue;
 
@@ -120,7 +119,7 @@ class BrowserFrame extends Handler {
         mDatabase = WebViewDatabase.getInstance(context);
         mWebViewCore = w;
 
-        if (Config.LOGV) {
+        if (WebView.LOGV_ENABLED) {
             Log.v(LOGTAG, "BrowserFrame constructor: this=" + this);
         }
     }
@@ -331,7 +330,7 @@ class BrowserFrame extends Handler {
         switch (msg.what) {
             case FRAME_COMPLETED: {
                 if (mSettings.getSavePassword() && hasPasswordField()) {
-                    if (Config.DEBUG) {
+                    if (WebView.DEBUG) {
                         Assert.assertNotNull(mCallbackProxy.getBackForwardList()
                                 .getCurrentItem());
                     }
@@ -480,7 +479,7 @@ class BrowserFrame extends Handler {
             }
             if (mSettings.getSavePassword() && hasPasswordField()) {
                 try {
-                    if (Config.DEBUG) {
+                    if (WebView.DEBUG) {
                         Assert.assertNotNull(mCallbackProxy.getBackForwardList()
                                 .getCurrentItem());
                     }
@@ -528,7 +527,7 @@ class BrowserFrame extends Handler {
         // is this resource the main-frame top-level page?
         boolean isMainFramePage = mIsMainFrame;
 
-        if (Config.LOGV) {
+        if (WebView.LOGV_ENABLED) {
             Log.v(LOGTAG, "startLoadingResource: url=" + url + ", method="
                     + method + ", postData=" + postData + ", isHighPriority="
                     + isHighPriority + ", isMainFramePage=" + isMainFramePage);
diff --git a/core/java/android/webkit/CacheManager.java b/core/java/android/webkit/CacheManager.java
index 65a017d26cd0..0095b91f250b 100644
--- a/core/java/android/webkit/CacheManager.java
+++ b/core/java/android/webkit/CacheManager.java
@@ -19,7 +19,6 @@ package android.webkit;
 import android.content.Context;
 import android.net.http.Headers;
 import android.os.FileUtils;
-import android.util.Config;
 import android.util.Log;
 import java.io.File;
 import java.io.FileInputStream;
@@ -321,7 +320,7 @@ public final class CacheManager {
             }
         }
 
-        if (Config.LOGV) {
+        if (WebView.LOGV_ENABLED) {
             Log.v(LOGTAG, "getCacheFile for url " + url);
         }
 
@@ -423,7 +422,7 @@ public final class CacheManager {
 
         mDataBase.addCache(url, cacheRet);
 
-        if (Config.LOGV) {
+        if (WebView.LOGV_ENABLED) {
             Log.v(LOGTAG, "saveCacheFile for url " + url);
         }
     }
diff --git a/core/java/android/webkit/CallbackProxy.java b/core/java/android/webkit/CallbackProxy.java
index 0f9f29cedb6d..5f8acc87db63 100644
--- a/core/java/android/webkit/CallbackProxy.java
+++ b/core/java/android/webkit/CallbackProxy.java
@@ -30,7 +30,6 @@ import android.os.Handler;
 import android.os.Message;
 import android.os.SystemClock;
 import android.provider.Browser;
-import android.util.Config;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
@@ -822,7 +821,7 @@ class CallbackProxy extends Handler {
             String password, Message resumeMsg) {
         // resumeMsg should be null at this point because we want to create it
         // within the CallbackProxy.
-        if (Config.DEBUG) {
+        if (WebView.DEBUG) {
             junit.framework.Assert.assertNull(resumeMsg);
         }
         resumeMsg = obtainMessage(NOTIFY);
diff --git a/core/java/android/webkit/CookieManager.java b/core/java/android/webkit/CookieManager.java
index d90a2fdbd11b..c0c6775c3f53 100644
--- a/core/java/android/webkit/CookieManager.java
+++ b/core/java/android/webkit/CookieManager.java
@@ -18,7 +18,6 @@ package android.webkit;
 
 import android.net.ParseException;
 import android.net.WebAddress;
-import android.util.Config;
 import android.util.Log;
 
 import java.util.ArrayList;
@@ -263,7 +262,7 @@ public final class CookieManager {
         if (!mAcceptCookie || uri == null) {
             return;
         }
-        if (Config.LOGV) {
+        if (WebView.LOGV_ENABLED) {
             Log.v(LOGTAG, "setCookie: uri: " + uri + " value: " + value);
         }
 
@@ -428,12 +427,12 @@ public final class CookieManager {
             }
         }
         if (ret.length() > 0) {
-            if (Config.LOGV) {
+            if (WebView.LOGV_ENABLED) {
                 Log.v(LOGTAG, "getCookie: uri: " + uri + " value: " + ret);
             }
             return ret.toString();
         } else {
-            if (Config.LOGV) {
+            if (WebView.LOGV_ENABLED) {
                 Log.v(LOGTAG, "getCookie: uri: " + uri
                         + " But can't find cookie.");
             }
@@ -589,7 +588,7 @@ public final class CookieManager {
             Iterator<ArrayList<Cookie>> listIter = cookieLists.iterator();
             while (listIter.hasNext() && count < MAX_RAM_COOKIES_COUNT) {
                 ArrayList<Cookie> list = listIter.next();
-                if (Config.DEBUG) {
+                if (WebView.DEBUG) {
                     Iterator<Cookie> iter = list.iterator();
                     while (iter.hasNext() && count < MAX_RAM_COOKIES_COUNT) {
                         Cookie cookie = iter.next();
@@ -609,7 +608,7 @@ public final class CookieManager {
 
         ArrayList<Cookie> retlist = new ArrayList<Cookie>();
         if (mapSize >= MAX_RAM_DOMAIN_COUNT || count >= MAX_RAM_COOKIES_COUNT) {
-            if (Config.DEBUG) {
+            if (WebView.DEBUG) {
                 Log.v(LOGTAG, count + " cookies used " + byteCount
                         + " bytes with " + mapSize + " domains");
             }
@@ -617,7 +616,7 @@ public final class CookieManager {
             int toGo = mapSize / 10 + 1;
             while (toGo-- > 0){
                 String domain = domains[toGo].toString();
-                if (Config.LOGV) {
+                if (WebView.LOGV_ENABLED) {
                     Log.v(LOGTAG, "delete domain: " + domain
                             + " from RAM cache");
                 }
diff --git a/core/java/android/webkit/CookieSyncManager.java b/core/java/android/webkit/CookieSyncManager.java
index e37dc5622b3e..aa6c76b432b0 100644
--- a/core/java/android/webkit/CookieSyncManager.java
+++ b/core/java/android/webkit/CookieSyncManager.java
@@ -17,7 +17,6 @@
 package android.webkit;
 
 import android.content.Context;
-import android.util.Config;
 import android.util.Log;
 import android.webkit.CookieManager.Cookie;
 
@@ -171,7 +170,7 @@ public final class CookieSyncManager extends WebSyncManager {
     }
 
     protected void syncFromRamToFlash() {
-        if (Config.LOGV) {
+        if (WebView.LOGV_ENABLED) {
             Log.v(LOGTAG, "CookieSyncManager::syncFromRamToFlash STARTS");
         }
 
@@ -188,7 +187,7 @@ public final class CookieSyncManager extends WebSyncManager {
                 CookieManager.getInstance().deleteLRUDomain();
         syncFromRamToFlash(lruList);
 
-        if (Config.LOGV) {
+        if (WebView.LOGV_ENABLED) {
             Log.v(LOGTAG, "CookieSyncManager::syncFromRamToFlash DONE");
         }
     }
diff --git a/core/java/android/webkit/FrameLoader.java b/core/java/android/webkit/FrameLoader.java
index 42d03f0dcc99..6f1b16047950 100644
--- a/core/java/android/webkit/FrameLoader.java
+++ b/core/java/android/webkit/FrameLoader.java
@@ -18,7 +18,6 @@ package android.webkit;
 
 import android.net.http.EventHandler;
 import android.net.http.RequestHandle;
-import android.util.Config;
 import android.util.Log;
 import android.webkit.CacheManager.CacheResult;
 
@@ -121,7 +120,7 @@ class FrameLoader {
         } else if (handleLocalFile(url, mListener, mSettings)) {
             return true;
         }
-        if (Config.LOGV) {
+        if (WebView.LOGV_ENABLED) {
             Log.v(LOGTAG, "FrameLoader.executeLoad: url protocol not supported:"
                     + mListener.url());
         }
@@ -181,7 +180,7 @@ class FrameLoader {
             return true;
         }
 
-        if (Config.LOGV) {
+        if (WebView.LOGV_ENABLED) {
             Log.v(LOGTAG, "FrameLoader: http " + mMethod + " load for: "
                     + mListener.url());
         }
@@ -212,7 +211,7 @@ class FrameLoader {
      * setup a load from the byte stream in a CacheResult.
      */
     private void startCacheLoad(CacheResult result) {
-        if (Config.LOGV) {
+        if (WebView.LOGV_ENABLED) {
             Log.v(LOGTAG, "FrameLoader: loading from cache: "
                   + mListener.url());
         }
@@ -286,7 +285,7 @@ class FrameLoader {
             // of it's state. If it is not in the cache, then go to the 
             // network.
             case WebSettings.LOAD_CACHE_ELSE_NETWORK: {
-                if (Config.LOGV) {
+                if (WebView.LOGV_ENABLED) {
                     Log.v(LOGTAG, "FrameLoader: checking cache: "
                             + mListener.url());
                 }
diff --git a/core/java/android/webkit/JWebCoreJavaBridge.java b/core/java/android/webkit/JWebCoreJavaBridge.java
index 361091f76d11..1831c9234b08 100644
--- a/core/java/android/webkit/JWebCoreJavaBridge.java
+++ b/core/java/android/webkit/JWebCoreJavaBridge.java
@@ -18,7 +18,6 @@ package android.webkit;
 
 import android.os.Handler;
 import android.os.Message;
-import android.util.Config;
 import android.util.Log;
 
 final class JWebCoreJavaBridge extends Handler {
@@ -176,7 +175,7 @@ final class JWebCoreJavaBridge extends Handler {
      * @param timemillis The relative time when the timer should fire
      */
     private void setSharedTimer(long timemillis) {
-        if (Config.LOGV) Log.v(LOGTAG, "setSharedTimer " + timemillis);
+        if (WebView.LOGV_ENABLED) Log.v(LOGTAG, "setSharedTimer " + timemillis);
 
         if (timemillis <= 0) {
             // we don't accumulate the sharedTimer unless it is a delayed
@@ -200,7 +199,7 @@ final class JWebCoreJavaBridge extends Handler {
      * Stop the shared timer.
      */
     private void stopSharedTimer() {
-        if (Config.LOGV) {
+        if (WebView.LOGV_ENABLED) {
             Log.v(LOGTAG, "stopSharedTimer removing all timers");
         }
         removeMessages(TIMER_MESSAGE);
diff --git a/core/java/android/webkit/LoadListener.java b/core/java/android/webkit/LoadListener.java
index e0a9d317f4d5..716d504570f3 100644
--- a/core/java/android/webkit/LoadListener.java
+++ b/core/java/android/webkit/LoadListener.java
@@ -29,7 +29,6 @@ import android.net.http.SslCertificate;
 
 import android.os.Handler;
 import android.os.Message;
-import android.util.Config;
 import android.util.Log;
 import android.webkit.CacheManager.CacheResult;
 
@@ -134,7 +133,7 @@ class LoadListener extends Handler implements EventHandler {
 
     LoadListener(Context context, BrowserFrame frame, String url,
             int nativeLoader, boolean synchronous, boolean isMainPageLoader) {
-        if (Config.LOGV) {
+        if (WebView.LOGV_ENABLED) {
             Log.v(LOGTAG, "LoadListener constructor url=" + url);
         }
         mContext = context;
@@ -285,7 +284,7 @@ class LoadListener extends Handler implements EventHandler {
      * directly
      */
     public void headers(Headers headers) {
-        if (Config.LOGV) Log.v(LOGTAG, "LoadListener.headers");
+        if (WebView.LOGV_ENABLED) Log.v(LOGTAG, "LoadListener.headers");
         sendMessageInternal(obtainMessage(MSG_CONTENT_HEADERS, headers));
     }
 
@@ -432,7 +431,7 @@ class LoadListener extends Handler implements EventHandler {
      */
     public void status(int majorVersion, int minorVersion,
             int code, /* Status-Code value */ String reasonPhrase) {
-        if (Config.LOGV) {
+        if (WebView.LOGV_ENABLED) {
             Log.v(LOGTAG, "LoadListener: from: " + mUrl
                     + " major: " + majorVersion
                     + " minor: " + minorVersion
@@ -489,7 +488,7 @@ class LoadListener extends Handler implements EventHandler {
      * directly
      */
     public void error(int id, String description) {
-        if (Config.LOGV) {
+        if (WebView.LOGV_ENABLED) {
             Log.v(LOGTAG, "LoadListener.error url:" +
                     url() + " id:" + id + " description:" + description);
         }
@@ -517,7 +516,7 @@ class LoadListener extends Handler implements EventHandler {
      * mDataBuilder is a thread-safe structure.
      */
     public void data(byte[] data, int length) {
-        if (Config.LOGV) {
+        if (WebView.LOGV_ENABLED) {
             Log.v(LOGTAG, "LoadListener.data(): url: " + url());
         }
 
@@ -555,7 +554,7 @@ class LoadListener extends Handler implements EventHandler {
      * directly
      */
     public void endData() {
-        if (Config.LOGV) {
+        if (WebView.LOGV_ENABLED) {
             Log.v(LOGTAG, "LoadListener.endData(): url: " + url());
         }
         sendMessageInternal(obtainMessage(MSG_CONTENT_FINISHED));
@@ -608,7 +607,7 @@ class LoadListener extends Handler implements EventHandler {
                 // before calling it.
                 if (mCacheLoader != null) {
                     mCacheLoader.load();
-                    if (Config.LOGV) {
+                    if (WebView.LOGV_ENABLED) {
                         Log.v(LOGTAG, "LoadListener cache load url=" + url());
                     }
                     return;
@@ -658,7 +657,7 @@ class LoadListener extends Handler implements EventHandler {
                     CacheManager.HEADER_KEY_IFNONEMATCH) &&
                     !headers.containsKey(
                             CacheManager.HEADER_KEY_IFMODIFIEDSINCE)) {
-                if (Config.LOGV) {
+                if (WebView.LOGV_ENABLED) {
                     Log.v(LOGTAG, "FrameLoader: HTTP URL in cache " +
                             "and usable: " + url());
                 }
@@ -677,7 +676,7 @@ class LoadListener extends Handler implements EventHandler {
      * directly
      */
     public void handleSslErrorRequest(SslError error) {
-        if (Config.LOGV) {
+        if (WebView.LOGV_ENABLED) {
             Log.v(LOGTAG,
                     "LoadListener.handleSslErrorRequest(): url:" + url() +
                     " primary error: " + error.getPrimaryError() +
@@ -743,7 +742,7 @@ class LoadListener extends Handler implements EventHandler {
      * are null, cancel the request.
      */
     void handleAuthResponse(String username, String password) {
-        if (Config.LOGV) {
+        if (WebView.LOGV_ENABLED) {
             Log.v(LOGTAG, "LoadListener.handleAuthResponse: url: " + mUrl
                     + " username: " + username
                     + " password: " + password);
@@ -840,7 +839,7 @@ class LoadListener extends Handler implements EventHandler {
     }
 
     void attachRequestHandle(RequestHandle requestHandle) {
-        if (Config.LOGV) {
+        if (WebView.LOGV_ENABLED) {
             Log.v(LOGTAG, "LoadListener.attachRequestHandle(): " +
                     "requestHandle: " +  requestHandle);
         }
@@ -848,7 +847,7 @@ class LoadListener extends Handler implements EventHandler {
     }
 
     void detachRequestHandle() {
-        if (Config.LOGV) {
+        if (WebView.LOGV_ENABLED) {
             Log.v(LOGTAG, "LoadListener.detachRequestHandle(): " +
                     "requestHandle: " + mRequestHandle);
         }
@@ -887,7 +886,7 @@ class LoadListener extends Handler implements EventHandler {
      */
     static boolean willLoadFromCache(String url) {
         boolean inCache = CacheManager.getCacheFile(url, null) != null;
-        if (Config.LOGV) {
+        if (WebView.LOGV_ENABLED) {
             Log.v(LOGTAG, "willLoadFromCache: " + url + " in cache: " + 
                     inCache);
         }
@@ -1057,7 +1056,7 @@ class LoadListener extends Handler implements EventHandler {
      * EventHandler's method call.
      */
     public void cancel() {
-        if (Config.LOGV) {
+        if (WebView.LOGV_ENABLED) {
             if (mRequestHandle == null) {
                 Log.v(LOGTAG, "LoadListener.cancel(): no requestHandle");
             } else {
@@ -1189,7 +1188,7 @@ class LoadListener extends Handler implements EventHandler {
             tearDown();
         }
 
-        if (Config.LOGV) {
+        if (WebView.LOGV_ENABLED) {
             Log.v(LOGTAG, "LoadListener.onRedirect(): redirect to: " +
                     redirectTo);
         }
@@ -1203,7 +1202,7 @@ class LoadListener extends Handler implements EventHandler {
             Pattern.compile("^((?:[xX]-)?[a-zA-Z\\*]+/[\\w\\+\\*-]+[\\.[\\w\\+-]+]*)$");
 
     private void parseContentTypeHeader(String contentType) {
-        if (Config.LOGV) {
+        if (WebView.LOGV_ENABLED) {
             Log.v(LOGTAG, "LoadListener.parseContentTypeHeader: " +
                     "contentType: " + contentType);
         }
@@ -1393,7 +1392,7 @@ class LoadListener extends Handler implements EventHandler {
      */
     private String guessMimeTypeFromExtension() {
         // PENDING: need to normalize url
-        if (Config.LOGV) {
+        if (WebView.LOGV_ENABLED) {
             Log.v(LOGTAG, "guessMimeTypeFromExtension: mURL = " + mUrl);
         }
 
@@ -1428,7 +1427,7 @@ class LoadListener extends Handler implements EventHandler {
      * Cycle through our messages for synchronous loads.
      */
     /* package */ void loadSynchronousMessages() {
-        if (Config.DEBUG && !mSynchronous) {
+        if (WebView.DEBUG && !mSynchronous) {
             throw new AssertionError();
         }
         // Note: this can be called twice if it is a synchronous network load,
diff --git a/core/java/android/webkit/Network.java b/core/java/android/webkit/Network.java
index 6fa07753dea3..c9b80ce77df6 100644
--- a/core/java/android/webkit/Network.java
+++ b/core/java/android/webkit/Network.java
@@ -20,7 +20,6 @@ import android.content.Context;
 import android.net.http.*;
 import android.os.*;
 import android.util.Log;
-import android.util.Config;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
@@ -133,7 +132,7 @@ class Network {
      * XXX: Must be created in the same thread as WebCore!!!!!
      */
     private Network(Context context) {
-        if (Config.DEBUG) {
+        if (WebView.DEBUG) {
             Assert.assertTrue(Thread.currentThread().
                     getName().equals(WebViewCore.THREAD_NAME));
         }
@@ -233,7 +232,7 @@ class Network {
      * connecting through the proxy.
      */
     public synchronized void setProxyUsername(String proxyUsername) {
-        if (Config.DEBUG) {
+        if (WebView.DEBUG) {
             Assert.assertTrue(isValidProxySet());
         }
 
@@ -253,7 +252,7 @@ class Network {
      * connecting through the proxy.
      */
     public synchronized void setProxyPassword(String proxyPassword) {
-        if (Config.DEBUG) {
+        if (WebView.DEBUG) {
             Assert.assertTrue(isValidProxySet());
         }
 
@@ -267,7 +266,7 @@ class Network {
      * @return True iff succeeds.
      */
     public boolean saveState(Bundle outState) {
-        if (Config.LOGV) {
+        if (WebView.LOGV_ENABLED) {
             Log.v(LOGTAG, "Network.saveState()");
         }
 
@@ -281,7 +280,7 @@ class Network {
      * @return True iff succeeds.
      */
     public boolean restoreState(Bundle inState) {
-        if (Config.LOGV) {
+        if (WebView.LOGV_ENABLED) {
             Log.v(LOGTAG, "Network.restoreState()");
         }
 
@@ -301,7 +300,7 @@ class Network {
      * @param loader The loader that resulted in SSL errors.
      */
     public void handleSslErrorRequest(LoadListener loader) {
-        if (Config.DEBUG) Assert.assertNotNull(loader);
+        if (WebView.DEBUG) Assert.assertNotNull(loader);
         if (loader != null) {
             mSslErrorHandler.handleSslErrorRequest(loader);
         }
@@ -314,7 +313,7 @@ class Network {
      * authentication request.
      */
     public void handleAuthRequest(LoadListener loader) {
-        if (Config.DEBUG) Assert.assertNotNull(loader);
+        if (WebView.DEBUG) Assert.assertNotNull(loader);
         if (loader != null) {
             mHttpAuthHandler.handleAuthRequest(loader);
         }
diff --git a/core/java/android/webkit/SslErrorHandler.java b/core/java/android/webkit/SslErrorHandler.java
index 2e2fa12052ab..5f84bbe04dd3 100644
--- a/core/java/android/webkit/SslErrorHandler.java
+++ b/core/java/android/webkit/SslErrorHandler.java
@@ -22,7 +22,6 @@ import android.net.http.SslError;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.util.Config;
 import android.util.Log;
 
 import java.util.LinkedList;
@@ -121,7 +120,7 @@ public class SslErrorHandler extends Handler {
      * Handles SSL error(s) on the way up to the user.
      */
     /* package */ synchronized void handleSslErrorRequest(LoadListener loader) {
-        if (Config.LOGV) {
+        if (WebView.LOGV_ENABLED) {
             Log.v(LOGTAG, "SslErrorHandler.handleSslErrorRequest(): " +
                   "url=" + loader.url());
         }
@@ -158,14 +157,14 @@ public class SslErrorHandler extends Handler {
 
             SslError error = loader.sslError();
 
-            if (Config.DEBUG) {
+            if (WebView.DEBUG) {
                 Assert.assertNotNull(error);
             }
 
             int primary = error.getPrimaryError();
             String host = loader.host();
 
-            if (Config.DEBUG) {
+            if (WebView.DEBUG) {
                 Assert.assertTrue(host != null && primary != 0);
             }
 
@@ -206,11 +205,11 @@ public class SslErrorHandler extends Handler {
      */
     /* package */ synchronized void handleSslErrorResponse(boolean proceed) {
         LoadListener loader = mLoaderQueue.poll();
-        if (Config.DEBUG) {
+        if (WebView.DEBUG) {
             Assert.assertNotNull(loader);
         }
 
-        if (Config.LOGV) {
+        if (WebView.LOGV_ENABLED) {
             Log.v(LOGTAG, "SslErrorHandler.handleSslErrorResponse():"
                   + " proceed: " + proceed
                   + " url:" + loader.url());
@@ -222,7 +221,7 @@ public class SslErrorHandler extends Handler {
                 int primary = loader.sslError().getPrimaryError();
                 String host = loader.host();
 
-                if (Config.DEBUG) {
+                if (WebView.DEBUG) {
                     Assert.assertTrue(host != null && primary != 0);
                 }
                 boolean hasKey = mSslPrefTable.containsKey(host);
diff --git a/core/java/android/webkit/StreamLoader.java b/core/java/android/webkit/StreamLoader.java
index 9098307e8052..705157c639f2 100644
--- a/core/java/android/webkit/StreamLoader.java
+++ b/core/java/android/webkit/StreamLoader.java
@@ -20,7 +20,6 @@ import android.net.http.EventHandler;
 import android.net.http.Headers;
 import android.os.Handler;
 import android.os.Message;
-import android.util.Config;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -114,7 +113,7 @@ abstract class StreamLoader extends Handler {
      * @see android.os.Handler#handleMessage(android.os.Message)
      */
     public void handleMessage(Message msg) {
-        if (Config.DEBUG && mHandler.isSynchronous()) {
+        if (WebView.DEBUG && mHandler.isSynchronous()) {
             throw new AssertionError();
         }
         switch(msg.what) {
diff --git a/core/java/android/webkit/URLUtil.java b/core/java/android/webkit/URLUtil.java
index 0e8144edd60a..d6ac3e9093bf 100644
--- a/core/java/android/webkit/URLUtil.java
+++ b/core/java/android/webkit/URLUtil.java
@@ -23,7 +23,6 @@ import java.util.regex.Pattern;
 import android.net.Uri;
 import android.net.ParseException;
 import android.net.WebAddress;
-import android.util.Config;
 import android.util.Log;
 
 public final class URLUtil {
@@ -62,7 +61,7 @@ public final class URLUtil {
             webAddress = new WebAddress(inUrl);
         } catch (ParseException ex) {
 
-            if (Config.LOGV) {
+            if (WebView.LOGV_ENABLED) {
                 Log.v(LOGTAG, "smartUrlFilter: failed to parse url = " + inUrl);
             }
             return retVal;
diff --git a/core/java/android/webkit/WebBackForwardList.java b/core/java/android/webkit/WebBackForwardList.java
index 9dea5ecbecd4..ffd6a118d9e6 100644
--- a/core/java/android/webkit/WebBackForwardList.java
+++ b/core/java/android/webkit/WebBackForwardList.java
@@ -16,7 +16,6 @@
 
 package android.webkit;
 
-import android.util.Config;
 import java.io.Serializable;
 import java.util.ArrayList;
 
@@ -138,7 +137,7 @@ public class WebBackForwardList implements Cloneable, Serializable {
         // when removing the first item, we can assert that the index is 0.
         // This lets us change the current index without having to query the
         // native BackForwardList.
-        if (Config.DEBUG && (index != 0)) {
+        if (WebView.DEBUG && (index != 0)) {
             throw new AssertionError();
         }
         final WebHistoryItem h = mArray.remove(index);
diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java
index bc8e3d97fa47..98e66b6f39d2 100644
--- a/core/java/android/webkit/WebSettings.java
+++ b/core/java/android/webkit/WebSettings.java
@@ -159,6 +159,8 @@ public class WebSettings {
     private boolean         mSupportZoom = true;
     private boolean         mBuiltInZoomControls = false;
     private boolean         mAllowFileAccess = true;
+    private String          mAppCachePath = "";
+    private boolean         mAppCacheEnabled = false;
 
     // Class to handle messages before WebCore is ready.
     private class EventHandler {
@@ -899,6 +901,33 @@ public class WebSettings {
     }
 
     /**
+     * Tell the WebView to enable Application Caches API.
+     * @param flag True if the WebView should enable Application Caches.
+     * @hide pending api council approval
+     */
+    public synchronized void setAppCacheEnabled(boolean flag) {
+        if (mAppCacheEnabled != flag) {
+            mAppCacheEnabled = flag;
+            postSync();
+        }
+    }
+
+    /**
+     * Set a custom path to the Application Caches files. The client
+     * must ensure it exists before this call.
+     * @param appCachePath String path to the directory containing Application
+     * Caches files. The appCache path can be the empty string but should not
+     * be null. Passing null for this parameter will result in a no-op.
+     * @hide pending api council approval
+     */
+    public synchronized void setAppCachePath(String appCachePath) {
+        if (appCachePath != null && !appCachePath.equals(mAppCachePath)) {
+            mAppCachePath = appCachePath;
+            postSync();
+        }
+    }
+
+    /**
      * Return true if javascript is enabled. <b>Note: The default is false.</b>
      * @return True if javascript is enabled.
      */
@@ -1101,7 +1130,7 @@ public class WebSettings {
     /*package*/
     synchronized void syncSettingsAndCreateHandler(BrowserFrame frame) {
         mBrowserFrame = frame;
-        if (android.util.Config.DEBUG) {
+        if (WebView.DEBUG) {
             junit.framework.Assert.assertTrue(frame.mNativeFrame != 0);
         }
         nativeSync(frame.mNativeFrame);
diff --git a/core/java/android/webkit/WebSyncManager.java b/core/java/android/webkit/WebSyncManager.java
index e6e9994486be..ded17ed518c7 100644
--- a/core/java/android/webkit/WebSyncManager.java
+++ b/core/java/android/webkit/WebSyncManager.java
@@ -21,7 +21,6 @@ import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
 import android.os.Process;
-import android.util.Config;
 import android.util.Log;
 
 abstract class WebSyncManager implements Runnable {
@@ -48,7 +47,7 @@ abstract class WebSyncManager implements Runnable {
         @Override
         public void handleMessage(Message msg) {
             if (msg.what == SYNC_MESSAGE) {
-                if (Config.LOGV) {
+                if (WebView.LOGV_ENABLED) {
                     Log.v(LOGTAG, "*** WebSyncManager sync ***");
                 }
                 syncFromRamToFlash();
@@ -95,7 +94,7 @@ abstract class WebSyncManager implements Runnable {
      * sync() forces sync manager to sync now
      */
     public void sync() {
-        if (Config.LOGV) {
+        if (WebView.LOGV_ENABLED) {
             Log.v(LOGTAG, "*** WebSyncManager sync ***");
         }
         if (mHandler == null) {
@@ -110,7 +109,7 @@ abstract class WebSyncManager implements Runnable {
      * resetSync() resets sync manager's timer
      */
     public void resetSync() {
-        if (Config.LOGV) {
+        if (WebView.LOGV_ENABLED) {
             Log.v(LOGTAG, "*** WebSyncManager resetSync ***");
         }
         if (mHandler == null) {
@@ -125,7 +124,7 @@ abstract class WebSyncManager implements Runnable {
      * startSync() requests sync manager to start sync
      */
     public void startSync() {
-        if (Config.LOGV) {
+        if (WebView.LOGV_ENABLED) {
             Log.v(LOGTAG, "***  WebSyncManager startSync ***, Ref count:" + 
                     mStartSyncRefCount);
         }
@@ -143,7 +142,7 @@ abstract class WebSyncManager implements Runnable {
      * the queue to break the sync loop
      */
     public void stopSync() {
-        if (Config.LOGV) {
+        if (WebView.LOGV_ENABLED) {
             Log.v(LOGTAG, "*** WebSyncManager stopSync ***, Ref count:" + 
                     mStartSyncRefCount);
         }
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 34709aa85225..6e79bc9acb43 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -42,7 +42,6 @@ import android.text.IClipboard;
 import android.text.Selection;
 import android.text.Spannable;
 import android.util.AttributeSet;
-import android.util.Config;
 import android.util.EventLog;
 import android.util.Log;
 import android.view.Gravity;
@@ -207,7 +206,7 @@ public class WebView extends AbsoluteLayout
     // keep debugging parameters near the top of the file
     static final String LOGTAG = "webview";
     static final boolean DEBUG = false;
-    static final boolean LOGV_ENABLED = DEBUG ? Config.LOGD : Config.LOGV;
+    static final boolean LOGV_ENABLED = DEBUG;
 
     private class ExtendedZoomControls extends FrameLayout {
         public ExtendedZoomControls(Context context, AttributeSet attrs) {
@@ -2845,7 +2844,7 @@ public class WebView extends AbsoluteLayout
     // Should only be called in UI thread
     void switchOutDrawHistory() {
         if (null == mWebViewCore) return; // CallbackProxy may trigger this
-        if (mDrawHistory) {
+        if (mDrawHistory && mWebViewCore.pictureReady()) {
             mDrawHistory = false;
             invalidate();
             int oldScrollX = mScrollX;
@@ -3181,6 +3180,15 @@ public class WebView extends AbsoluteLayout
             return false;
         }
 
+        if (keyCode != KeyEvent.KEYCODE_SHIFT_LEFT
+                && keyCode != KeyEvent.KEYCODE_SHIFT_RIGHT) {
+            // turn off copy select if a shift-key combo is pressed
+            mExtendSelection = mShiftIsPressed = false;
+            if (mTouchMode == TOUCH_SELECT_MODE) {
+                mTouchMode = TOUCH_INIT_MODE;
+            }
+        }
+
         if (getSettings().getNavDump()) {
             switch (keyCode) {
                 case KeyEvent.KEYCODE_4:
diff --git a/core/java/android/webkit/WebViewCore.java b/core/java/android/webkit/WebViewCore.java
index 302bc1a9dad8..1415597be09b 100644
--- a/core/java/android/webkit/WebViewCore.java
+++ b/core/java/android/webkit/WebViewCore.java
@@ -29,7 +29,6 @@ import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
 import android.os.Process;
-import android.util.Config;
 import android.util.Log;
 import android.util.SparseBooleanArray;
 import android.view.KeyEvent;
@@ -43,7 +42,7 @@ final class WebViewCore {
 
     private static final String LOGTAG = "webcore";
     static final boolean DEBUG = false;
-    static final boolean LOGV_ENABLED = DEBUG ? Config.LOGD : Config.LOGV;
+    static final boolean LOGV_ENABLED = DEBUG;
 
     static {
         // Load libwebcore during static initialization. This happens in the
@@ -286,6 +285,11 @@ final class WebViewCore {
      * split into parts. Called from the UI thread.
      */
     private native boolean nativeDrawContent(Canvas canvas, int color);
+
+    /**
+     * check to see if picture is blank and in progress
+     */
+    private native boolean nativePictureReady();
     
     /**
      * Redraw a portion of the picture set. The Point wh returns the
@@ -546,6 +550,7 @@ final class WebViewCore {
             "LOAD_DATA", // = 139;
             "TOUCH_UP", // = 140;
             "TOUCH_EVENT", // = 141;
+            "SET_ACTIVE", // = 142;
         };
 
     class EventHub {
@@ -1347,6 +1352,10 @@ final class WebViewCore {
         }
     }
 
+    /* package */ boolean pictureReady() {
+        return nativePictureReady();
+    }
+
     /*package*/ Picture copyContentPicture() {
         Picture result = new Picture();
         nativeCopyContentToPicture(result);
diff --git a/core/java/android/webkit/gears/AndroidWifiDataProvider.java b/core/java/android/webkit/gears/AndroidWifiDataProvider.java
index 7379f5953588..d2850b060386 100644
--- a/core/java/android/webkit/gears/AndroidWifiDataProvider.java
+++ b/core/java/android/webkit/gears/AndroidWifiDataProvider.java
@@ -33,7 +33,6 @@ import android.net.wifi.ScanResult;
 import android.net.wifi.WifiManager;
 import android.os.Handler;
 import android.os.Looper;
-import android.util.Config;
 import android.util.Log;
 import android.webkit.WebView;
 import java.util.List;
@@ -48,6 +47,11 @@ public final class AndroidWifiDataProvider extends BroadcastReceiver {
    */
   private static final String TAG = "Gears-J-WifiProvider";
   /**
+   * Flag for guarding Log.v() calls.
+   * Set to true to enable extra debug logging.
+   */
+  private static final boolean LOGV_ENABLED = false;
+  /**
    * Our Wifi manager instance.
    */
   private WifiManager mWifiManager;
@@ -104,7 +108,7 @@ public final class AndroidWifiDataProvider extends BroadcastReceiver {
    */
   public void shutdown() {
     mContext.unregisterReceiver(this);
-    if (Config.LOGV) {
+    if (LOGV_ENABLED) {
       Log.v(TAG, "Wifi provider closed.");
     }
   }
@@ -118,7 +122,7 @@ public final class AndroidWifiDataProvider extends BroadcastReceiver {
   public void onReceive(Context context, Intent intent) {
     if (intent.getAction().equals(
             mWifiManager.SCAN_RESULTS_AVAILABLE_ACTION)) {
-      if (Config.LOGV) {
+      if (LOGV_ENABLED) {
         Log.v(TAG, "Wifi scan resulst available");
       }
       onUpdateAvailable(mWifiManager.getScanResults(), mNativeObject);
diff --git a/core/java/android/webkit/gears/ApacheHttpRequestAndroid.java b/core/java/android/webkit/gears/ApacheHttpRequestAndroid.java
index 529e666dbb8e..74d27edd29b9 100644
--- a/core/java/android/webkit/gears/ApacheHttpRequestAndroid.java
+++ b/core/java/android/webkit/gears/ApacheHttpRequestAndroid.java
@@ -29,7 +29,6 @@ import android.net.http.Headers;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
-import android.util.Config;
 import android.util.Log;
 import android.webkit.CacheManager;
 import android.webkit.CacheManager.CacheResult;
@@ -88,6 +87,8 @@ import java.util.concurrent.locks.ReentrantLock;
 public final class ApacheHttpRequestAndroid {
     /** Debug logging tag. */
     private static final String LOG_TAG = "Gears-J";
+    /** Flag for guarding Log.v() calls. */
+    private static final boolean LOGV_ENABLED = false;
     /** HTTP response header line endings are CR-LF style. */
     private static final String HTTP_LINE_ENDING = "\r\n";
     /** Safe MIME type to use whenever it isn't specified. */
@@ -173,18 +174,18 @@ public final class ApacheHttpRequestAndroid {
         public void run() {
             boolean problem = false;
             try {
-                if (Config.LOGV) {
+                if (LOGV_ENABLED) {
                     Log.i(LOG_TAG, "REQUEST : " + mMethod.getRequestLine());
                 }
                 mResponse = mClient.execute(mMethod);
                 if (mResponse != null) {
-                    if (Config.LOGV) {
+                    if (LOGV_ENABLED) {
                         Log.i(LOG_TAG, "response (status line): "
                               + mResponse.getStatusLine());
                     }
                     mResponseLine = "" + mResponse.getStatusLine();
                 } else {
-                    if (Config.LOGV) {
+                    if (LOGV_ENABLED) {
                         Log.i(LOG_TAG, "problem, response == null");
                     }
                     problem = true;
@@ -198,7 +199,7 @@ public final class ApacheHttpRequestAndroid {
             }
 
             if (!problem) {
-                if (Config.LOGV) {
+                if (LOGV_ENABLED) {
                     Log.i(LOG_TAG, "Request complete ("
                           + mMethod.getRequestLine() + ")");
                 }
@@ -206,7 +207,7 @@ public final class ApacheHttpRequestAndroid {
                 mConnectionFailedLock.lock();
                 mConnectionFailed = true;
                 mConnectionFailedLock.unlock();
-                if (Config.LOGV) {
+                if (LOGV_ENABLED) {
                     Log.i(LOG_TAG, "Request FAILED ("
                           + mMethod.getRequestLine() + ")");
                 }
@@ -233,7 +234,7 @@ public final class ApacheHttpRequestAndroid {
                 try {
                     wait();
                 } catch (InterruptedException e) {
-                    if (Config.LOGV) {
+                    if (LOGV_ENABLED) {
                         Log.i(LOG_TAG, "InterruptedException while putting " +
                             "a DataPacket in the Buffer: " + e);
                     }
@@ -248,7 +249,7 @@ public final class ApacheHttpRequestAndroid {
                 try {
                     wait();
                 } catch (InterruptedException e) {
-                    if (Config.LOGV) {
+                    if (LOGV_ENABLED) {
                       Log.i(LOG_TAG, "InterruptedException while getting " +
                           "a DataPacket in the Buffer: " + e);
                     }
@@ -271,7 +272,7 @@ public final class ApacheHttpRequestAndroid {
                 try {
                     wait();
                 } catch (InterruptedException e) {
-                    if (Config.LOGV) {
+                    if (LOGV_ENABLED) {
                         Log.i(LOG_TAG, "InterruptedException while waiting " +
                             "until a DataPacket is consumed: " + e);
                     }
@@ -285,7 +286,7 @@ public final class ApacheHttpRequestAndroid {
                 try {
                     wait();
                 } catch (InterruptedException e) {
-                    if (Config.LOGV) {
+                    if (LOGV_ENABLED) {
                         Log.i(LOG_TAG, "InterruptedException while indicating "
                               + "that the DataPacket has been consumed: " + e);
                     }
@@ -373,14 +374,14 @@ public final class ApacheHttpRequestAndroid {
                 mSignal.packetConsumed();
                 mConnectionFailedLock.lock();
                 if (mConnectionFailed) {
-                    if (Config.LOGV) {
+                    if (LOGV_ENABLED) {
                         Log.i(LOG_TAG, "stopping loop on error");
                     }
                     finished = true;
                 }
                 mConnectionFailedLock.unlock();
             }
-            if (Config.LOGV) {
+            if (LOGV_ENABLED) {
                 Log.i(LOG_TAG, "flushing the outputstream...");
             }
             mOutputStream.flush();
@@ -399,7 +400,7 @@ public final class ApacheHttpRequestAndroid {
         private void write(DataPacket packet) {
             try {
                 if (mOutputStream == null) {
-                    if (Config.LOGV) {
+                    if (LOGV_ENABLED) {
                         Log.i(LOG_TAG, "NO OUTPUT STREAM !!!");
                     }
                     return;
@@ -407,7 +408,7 @@ public final class ApacheHttpRequestAndroid {
                 mOutputStream.write(packet.getBytes(), 0, packet.getLength());
                 mOutputStream.flush();
             } catch (IOException e) {
-                if (Config.LOGV) {
+                if (LOGV_ENABLED) {
                     Log.i(LOG_TAG, "exc: " + e);
                 }
                 mConnectionFailedLock.lock();
@@ -423,7 +424,7 @@ public final class ApacheHttpRequestAndroid {
                     mStreamingReady.await();
                 }
             } catch (InterruptedException e) {
-                if (Config.LOGV) {
+                if (LOGV_ENABLED) {
                     Log.i(LOG_TAG, "InterruptedException in "
                           + "StreamEntity::isReady() : ", e);
                 }
@@ -468,7 +469,7 @@ public final class ApacheHttpRequestAndroid {
      *                  False on failure.
      */
     public synchronized boolean open(String method, String url) {
-        if (Config.LOGV) {
+        if (LOGV_ENABLED) {
             Log.i(LOG_TAG, "open " + method + " " + url);
         }
         // Create the client
@@ -502,7 +503,7 @@ public final class ApacheHttpRequestAndroid {
         } else if ("DELETE".equalsIgnoreCase(method)) {
             mMethod = new HttpDelete(url);
         } else {
-            if (Config.LOGV) {
+            if (LOGV_ENABLED) {
                 Log.i(LOG_TAG, "Method " + method + " not supported");
             }
             return false;
@@ -549,7 +550,7 @@ public final class ApacheHttpRequestAndroid {
      * (unless already finished)
      */
     private void waitUntilConnectionFinished() {
-        if (Config.LOGV) {
+        if (LOGV_ENABLED) {
             Log.i(LOG_TAG, "waitUntilConnectionFinished("
                   + mConnectionFinished + ")");
         }
@@ -558,11 +559,11 @@ public final class ApacheHttpRequestAndroid {
                 try {
                     mHttpThread.join();
                     mConnectionFinished = true;
-                    if (Config.LOGV) {
+                    if (LOGV_ENABLED) {
                         Log.i(LOG_TAG, "http thread joined");
                     }
                 } catch (InterruptedException e) {
-                    if (Config.LOGV) {
+                    if (LOGV_ENABLED) {
                         Log.i(LOG_TAG, "interrupted: " + e);
                     }
                 }
@@ -596,7 +597,7 @@ public final class ApacheHttpRequestAndroid {
         Header[] headers = mResponse.getAllHeaders();
         for (int i = 0; i < headers.length; i++) {
             Header header = headers[i];
-            if (Config.LOGV) {
+            if (LOGV_ENABLED) {
                 Log.i(LOG_TAG, "header " + header.getName()
                       + " -> " + header.getValue());
             }
@@ -615,7 +616,7 @@ public final class ApacheHttpRequestAndroid {
      */
     public synchronized void setRequestHeader(String name, String value) {
         String[] mapValue = { name, value };
-        if (Config.LOGV) {
+        if (LOGV_ENABLED) {
             Log.i(LOG_TAG, "setRequestHeader: " + name + " => " + value);
         }
         if (name.equalsIgnoreCase(KEY_CONTENT_LENGTH)) {
@@ -647,7 +648,7 @@ public final class ApacheHttpRequestAndroid {
         while (it.hasNext()) {
             // Set the key case-sensitive.
             String[] entry = it.next();
-            if (Config.LOGV) {
+            if (LOGV_ENABLED) {
                 Log.i(LOG_TAG, "apply header " + entry[HEADERS_MAP_INDEX_KEY] +
                     " => " + entry[HEADERS_MAP_INDEX_VALUE]);
             }
@@ -671,7 +672,7 @@ public final class ApacheHttpRequestAndroid {
                 return null;
             }
         } else {
-            if (Config.LOGV) {
+            if (LOGV_ENABLED) {
                 Log.i(LOG_TAG, "getResponseHeader() called but "
                       + "response not received");
             }
@@ -687,7 +688,7 @@ public final class ApacheHttpRequestAndroid {
      */
     public synchronized String getAllResponseHeaders() {
         if (mResponseHeaders == null) {
-            if (Config.LOGV) {
+            if (LOGV_ENABLED) {
                 Log.i(LOG_TAG, "getAllResponseHeaders() called but "
                       + "response not received");
             }
@@ -715,7 +716,7 @@ public final class ApacheHttpRequestAndroid {
      * @param value The associated value.
      */
     private void setResponseHeader(String name, String value) {
-        if (Config.LOGV) {
+        if (LOGV_ENABLED) {
             Log.i(LOG_TAG, "Set response header " + name + ": " + value);
         }
         String mapValue[] = { name, value };
@@ -766,7 +767,7 @@ public final class ApacheHttpRequestAndroid {
         UrlInterceptHandlerGears.ServiceResponse serviceResponse =
             handler.getServiceResponse(url, mRequestHeaders);
         if (serviceResponse == null) {
-            if (Config.LOGV) {
+            if (LOGV_ENABLED) {
                 Log.i(LOG_TAG, "No response in LocalServer");
             }
             return false;
@@ -776,7 +777,7 @@ public final class ApacheHttpRequestAndroid {
         mBodyInputStream = serviceResponse.getInputStream();
         mResponseLine = serviceResponse.getStatusLine();
         mResponseHeaders = serviceResponse.getResponseHeaders();
-        if (Config.LOGV) {
+        if (LOGV_ENABLED) {
             Log.i(LOG_TAG, "Got response from LocalServer: " + mResponseLine);
         }
         return true;
@@ -803,19 +804,19 @@ public final class ApacheHttpRequestAndroid {
         CacheResult mCacheResult =
             CacheManager.getCacheFile(url, cacheRequestHeaders);
         if (mCacheResult == null) {
-            if (Config.LOGV) {
+            if (LOGV_ENABLED) {
                 Log.i(LOG_TAG, "No CacheResult for " + url);
             }
             return false;
         }
-        if (Config.LOGV) {
+        if (LOGV_ENABLED) {
             Log.i(LOG_TAG, "Got CacheResult from browser cache");
         }
         // Check for expiry. -1 is "never", otherwise milliseconds since 1970.
         // Can be compared to System.currentTimeMillis().
         long expires = mCacheResult.getExpires();
         if (expires >= 0 && System.currentTimeMillis() >= expires) {
-            if (Config.LOGV) {
+            if (LOGV_ENABLED) {
                 Log.i(LOG_TAG, "CacheResult expired "
                     + (System.currentTimeMillis() - expires)
                     + " milliseconds ago");
@@ -827,7 +828,7 @@ public final class ApacheHttpRequestAndroid {
         mBodyInputStream = mCacheResult.getInputStream();
         if (mBodyInputStream == null) {
             // Cache result may have gone away.
-            if (Config.LOGV) {
+            if (LOGV_ENABLED) {
                 Log.i(LOG_TAG, "No mBodyInputStream for CacheResult " + url);
             }
             return false;
@@ -855,7 +856,7 @@ public final class ApacheHttpRequestAndroid {
         }
         // Synthesize the response line.
         mResponseLine = "HTTP/1.1 " + statusCode + " " + statusMessage;
-        if (Config.LOGV) {
+        if (LOGV_ENABLED) {
             Log.i(LOG_TAG, "Synthesized " + mResponseLine);
         }
         // Synthesize the returned headers from cache.
@@ -914,7 +915,7 @@ public final class ApacheHttpRequestAndroid {
      */
     public synchronized boolean createCacheResult(
         String url, int responseCode, String mimeType, String encoding) {
-        if (Config.LOGV) {
+        if (LOGV_ENABLED) {
             Log.i(LOG_TAG, "Making cache entry for " + url);
         }
         // Take the headers and parse them into a format needed by
@@ -935,14 +936,14 @@ public final class ApacheHttpRequestAndroid {
         mCacheResult = CacheManager.createCacheFile(
             url, responseCode, cacheHeaders, mimeType, true);
         if (mCacheResult != null) {
-            if (Config.LOGV) {
+            if (LOGV_ENABLED) {
                 Log.i(LOG_TAG, "Saving into cache");
             }
             mCacheResult.setEncoding(encoding);
             mCacheResultUrl = url;
             return true;
         } else {
-            if (Config.LOGV) {
+            if (LOGV_ENABLED) {
                 Log.i(LOG_TAG, "Couldn't create mCacheResult");
             }
             return false;
@@ -960,7 +961,7 @@ public final class ApacheHttpRequestAndroid {
      */
     public synchronized boolean appendCacheResult(byte[] data, int bytes) {
         if (mCacheResult == null) {
-            if (Config.LOGV) {
+            if (LOGV_ENABLED) {
                 Log.i(LOG_TAG, "appendCacheResult() called without a "
                       + "CacheResult initialized");
             }
@@ -969,7 +970,7 @@ public final class ApacheHttpRequestAndroid {
         try {
             mCacheResult.getOutputStream().write(data, 0, bytes);
         } catch (IOException ex) {
-            if (Config.LOGV) {
+            if (LOGV_ENABLED) {
                 Log.i(LOG_TAG, "Got IOException writing cache data: " + ex);
             }
             return false;
@@ -984,14 +985,14 @@ public final class ApacheHttpRequestAndroid {
      */
     public synchronized boolean saveCacheResult() {
         if (mCacheResult == null || mCacheResultUrl == null) {
-            if (Config.LOGV) {
+            if (LOGV_ENABLED) {
                 Log.i(LOG_TAG, "Tried to save cache result but "
                       + "createCacheResult not called");
             }
             return false;
         }
 
-        if (Config.LOGV) {
+        if (LOGV_ENABLED) {
             Log.i(LOG_TAG, "Saving cache result");
         }
         CacheManager.saveCacheFile(mCacheResultUrl, mCacheResult);
@@ -1006,7 +1007,7 @@ public final class ApacheHttpRequestAndroid {
      * ability to receive a null packet for sendPostData().
      */
     public synchronized void abort() {
-        if (Config.LOGV) {
+        if (LOGV_ENABLED) {
             Log.i(LOG_TAG, "ABORT CALLED");
         }
         if (mMethod != null) {
@@ -1019,7 +1020,7 @@ public final class ApacheHttpRequestAndroid {
      * thread to complete.
      */
     public synchronized void interrupt() {
-        if (Config.LOGV) {
+        if (LOGV_ENABLED) {
             Log.i(LOG_TAG, "INTERRUPT CALLED");
         }
         mConnectionFailedLock.lock();
@@ -1053,7 +1054,7 @@ public final class ApacheHttpRequestAndroid {
                     mBodyInputStream = entity.getContent();
                 }
             } catch (IOException inputException) {
-                if (Config.LOGV) {
+                if (LOGV_ENABLED) {
                     Log.i(LOG_TAG, "Failed to connect InputStream: "
                           + inputException);
                 }
@@ -1062,7 +1063,7 @@ public final class ApacheHttpRequestAndroid {
             }
             if (mBodyInputStream == null) {
                 // No error stream either. Treat as a 0 byte response.
-                if (Config.LOGV) {
+                if (LOGV_ENABLED) {
                     Log.i(LOG_TAG, "No InputStream");
                 }
                 return 0; // EOF.
@@ -1081,7 +1082,7 @@ public final class ApacheHttpRequestAndroid {
             }
         } catch (IOException e) {
             // An abort() interrupts us by calling close() on our stream.
-            if (Config.LOGV) {
+            if (LOGV_ENABLED) {
                 Log.i(LOG_TAG, "Got IOException in mBodyInputStream.read(): ", e);
             }
             ret = -1;
diff --git a/core/java/android/widget/MediaController.java b/core/java/android/widget/MediaController.java
index b162a0eba1f4..0c9d980488ea 100644
--- a/core/java/android/widget/MediaController.java
+++ b/core/java/android/widget/MediaController.java
@@ -444,27 +444,55 @@ public class MediaController extends FrameLayout {
         updatePausePlay();
     }
 
+    // There are two scenarios that can trigger the seekbar listener to trigger:
+    //
+    // The first is the user using the touchpad to adjust the posititon of the
+    // seekbar's thumb. In this case onStartTrackingTouch is called followed by
+    // a number of onProgressChanged notifications, concluded by onStopTrackingTouch.
+    // We're setting the field "mDragging" to true for the duration of the dragging
+    // session to avoid jumps in the position in case of ongoing playback.
+    //
+    // The second scenario involves the user operating the scroll ball, in this
+    // case there WON'T BE onStartTrackingTouch/onStopTrackingTouch notifications,
+    // we will simply apply the updated position without suspending regular updates.
     private OnSeekBarChangeListener mSeekListener = new OnSeekBarChangeListener() {
-        long duration;
         public void onStartTrackingTouch(SeekBar bar) {
             show(3600000);
-            duration = mPlayer.getDuration();
-        }
-        public void onProgressChanged(SeekBar bar, int progress, boolean fromtouch) {
-            if (fromtouch) {
-                mDragging = true;
-                duration = mPlayer.getDuration();
-                long newposition = (duration * progress) / 1000L;
-                mPlayer.seekTo( (int) newposition);
-                if (mCurrentTime != null)
-                    mCurrentTime.setText(stringForTime( (int) newposition));
+
+            mDragging = true;
+
+            // By removing these pending progress messages we make sure
+            // that a) we won't update the progress while the user adjusts
+            // the seekbar and b) once the user is done dragging the thumb
+            // we will post one of these messages to the queue again and
+            // this ensures that there will be exactly one message queued up.
+            mHandler.removeMessages(SHOW_PROGRESS);
+        }
+
+        public void onProgressChanged(SeekBar bar, int progress, boolean fromuser) {
+            if (!fromuser) {
+                // We're not interested in programmatically generated changes to
+                // the progress bar's position.
+                return;
             }
+
+            long duration = mPlayer.getDuration();
+            long newposition = (duration * progress) / 1000L;
+            mPlayer.seekTo( (int) newposition);
+            if (mCurrentTime != null)
+                mCurrentTime.setText(stringForTime( (int) newposition));
         }
+
         public void onStopTrackingTouch(SeekBar bar) {
             mDragging = false;
             setProgress();
             updatePausePlay();
             show(sDefaultTimeout);
+
+            // Ensure that progress is properly updated in the future,
+            // the call to show() does not guarantee this because it is a
+            // no-op if we are already showing.
+            mHandler.sendEmptyMessage(SHOW_PROGRESS);
         }
     };
 
diff --git a/core/java/com/android/internal/app/IUsageStats.aidl b/core/java/com/android/internal/app/IUsageStats.aidl
index 6b053d5c9975..1ea74090a419 100755
--- a/core/java/com/android/internal/app/IUsageStats.aidl
+++ b/core/java/com/android/internal/app/IUsageStats.aidl
@@ -22,6 +22,7 @@ import com.android.internal.os.PkgUsageStats;
 interface IUsageStats {
     void noteResumeComponent(in ComponentName componentName);
     void notePauseComponent(in ComponentName componentName);
+    void noteLaunchTime(in ComponentName componentName, int millis);
     PkgUsageStats getPkgUsageStats(in ComponentName componentName);
     PkgUsageStats[] getAllPkgUsageStats();
 }
diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java
index f492ad1cd5db..58a9be85cddb 100644
--- a/core/java/com/android/internal/os/BatteryStatsImpl.java
+++ b/core/java/com/android/internal/os/BatteryStatsImpl.java
@@ -21,6 +21,7 @@ import android.os.NetStat;
 import android.os.Parcel;
 import android.os.ParcelFormatException;
 import android.os.Parcelable;
+import android.os.Process;
 import android.os.SystemClock;
 import android.telephony.TelephonyManager;
 import android.util.Log;
@@ -33,7 +34,10 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * All information we are collecting about things that can happen that impact
@@ -48,7 +52,7 @@ public final class BatteryStatsImpl extends BatteryStats {
     private static final int MAGIC = 0xBA757475; // 'BATSTATS' 
 
     // Current on-disk Parcel version
-    private static final int VERSION = 32;
+    private static final int VERSION = 34;
 
     private final File mFile;
     private final File mBackupFile;
@@ -63,11 +67,11 @@ public final class BatteryStatsImpl extends BatteryStats {
     // elapsed time by the number of active timers to arrive at that timer's share of the time.
     // In order to do this, we must refresh each timer whenever the number of active timers
     // changes.
-    final ArrayList<Timer> mPartialTimers = new ArrayList<Timer>();
-    final ArrayList<Timer> mFullTimers = new ArrayList<Timer>();
-    final ArrayList<Timer> mWindowTimers = new ArrayList<Timer>();
-    final SparseArray<ArrayList<Timer>> mSensorTimers
-            = new SparseArray<ArrayList<Timer>>();
+    final ArrayList<StopwatchTimer> mPartialTimers = new ArrayList<StopwatchTimer>();
+    final ArrayList<StopwatchTimer> mFullTimers = new ArrayList<StopwatchTimer>();
+    final ArrayList<StopwatchTimer> mWindowTimers = new ArrayList<StopwatchTimer>();
+    final SparseArray<ArrayList<StopwatchTimer>> mSensorTimers
+            = new SparseArray<ArrayList<StopwatchTimer>>();
 
     // These are the objects that will want to do something when the device
     // is unplugged from power.
@@ -88,31 +92,33 @@ public final class BatteryStatsImpl extends BatteryStats {
     long mLastRealtime;
     
     boolean mScreenOn;
-    Timer mScreenOnTimer;
+    StopwatchTimer mScreenOnTimer;
     
     int mScreenBrightnessBin = -1;
-    final Timer[] mScreenBrightnessTimer = new Timer[NUM_SCREEN_BRIGHTNESS_BINS];
+    final StopwatchTimer[] mScreenBrightnessTimer = new StopwatchTimer[NUM_SCREEN_BRIGHTNESS_BINS];
     
     Counter mInputEventCounter;
     
     boolean mPhoneOn;
-    Timer mPhoneOnTimer;
+    StopwatchTimer mPhoneOnTimer;
     
     int mPhoneSignalStrengthBin = -1;
-    final Timer[] mPhoneSignalStrengthsTimer = new Timer[NUM_SIGNAL_STRENGTH_BINS];
+    final StopwatchTimer[] mPhoneSignalStrengthsTimer = 
+            new StopwatchTimer[NUM_SIGNAL_STRENGTH_BINS];
     
     int mPhoneDataConnectionType = -1;
-    final Timer[] mPhoneDataConnectionsTimer = new Timer[NUM_DATA_CONNECTION_TYPES];
+    final StopwatchTimer[] mPhoneDataConnectionsTimer = 
+            new StopwatchTimer[NUM_DATA_CONNECTION_TYPES];
     
     boolean mWifiOn;
-    Timer mWifiOnTimer;
+    StopwatchTimer mWifiOnTimer;
     int mWifiOnUid = -1;
 
     boolean mWifiRunning;
-    Timer mWifiRunningTimer;
+    StopwatchTimer mWifiRunningTimer;
     
     boolean mBluetoothOn;
-    Timer mBluetoothOnTimer;
+    StopwatchTimer mBluetoothOnTimer;
     
     /**
      * These provide time bases that discount the time the device is plugged
@@ -135,6 +141,37 @@ public final class BatteryStatsImpl extends BatteryStats {
     int mDischargeCurrentLevel;
     
     long mLastWriteTime = 0; // Milliseconds
+    
+    /*
+     * Holds a SamplingTimer associated with each kernel wakelock name being tracked.
+     */
+    private final HashMap<String, SamplingTimer> mKernelWakelockStats = 
+            new HashMap<String, SamplingTimer>();
+    
+    public Map<String, ? extends SamplingTimer> getKernelWakelockStats() {
+        return mKernelWakelockStats;
+    }
+    
+    private static int sKernelWakelockUpdateVersion = 0;
+    
+    private static final int[] PROC_WAKELOCKS_FORMAT = new int[] {
+        Process.PROC_TAB_TERM|Process.PROC_OUT_STRING,                // 0: name
+        Process.PROC_TAB_TERM|Process.PROC_OUT_LONG,                  // 1: count
+        Process.PROC_TAB_TERM,
+        Process.PROC_TAB_TERM,
+        Process.PROC_TAB_TERM,
+        Process.PROC_TAB_TERM|Process.PROC_OUT_LONG,                  // 5: totalTime
+    };
+    
+    private final String[] mProcWakelocksName = new String[3];
+    private final long[] mProcWakelocksData = new long[3];
+    
+    /*
+     * Used as a buffer for reading in data from /proc/wakelocks before it is processed and added
+     * to mKernelWakelockStats.
+     */
+    private final Map<String, KernelWakelockStats> mProcWakelockFileStats = 
+            new HashMap<String, KernelWakelockStats>();
 
     // For debugging
     public BatteryStatsImpl() {
@@ -200,7 +237,7 @@ public final class BatteryStatsImpl extends BatteryStats {
         }
 
         @Override
-        public int getCount(int which) {
+        public int getCountLocked(int which) {
             int val;
             if (which == STATS_LAST) {
                 val = mLastCount;
@@ -242,11 +279,9 @@ public final class BatteryStatsImpl extends BatteryStats {
     /**
      * State for keeping track of timing information.
      */
-    public static final class Timer extends BatteryStats.Timer implements Unpluggable {
+    public static abstract class Timer extends BatteryStats.Timer implements Unpluggable {
         final int mType;
-        final ArrayList<Timer> mTimerPool;
-        
-        int mNesting;
+
         
         int mCount;
         int mLoadedCount;
@@ -281,24 +316,10 @@ public final class BatteryStatsImpl extends BatteryStats {
          * power.
          */
         long mUnpluggedTime;
-
-        /**
-         * The last time at which we updated the timer.  If mNesting is > 0,
-         * subtract this from the current battery time to find the amount of
-         * time we have been running since we last computed an update.
-         */
-        long mUpdateTime;
-        
-        /**
-         * The total time at which the timer was acquired, to determine if
-         * was actually held for an interesting duration.
-         */
-        long mAcquireTime;
         
-        Timer(int type, ArrayList<Timer> timerPool,
-                ArrayList<Unpluggable> unpluggables, Parcel in) {
+        Timer(int type, ArrayList<Unpluggable> unpluggables, Parcel in) {
             mType = type;
-            mTimerPool = timerPool;
+            
             mCount = in.readInt();
             mLoadedCount = in.readInt();
             mLastCount = in.readInt();
@@ -306,17 +327,19 @@ public final class BatteryStatsImpl extends BatteryStats {
             mTotalTime = in.readLong();
             mLoadedTime = in.readLong();
             mLastTime = in.readLong();
-            mUpdateTime = in.readLong();
             mUnpluggedTime = in.readLong();
             unpluggables.add(this);
         }
 
-        Timer(int type, ArrayList<Timer> timerPool,
-                ArrayList<Unpluggable> unpluggables) {
+        Timer(int type, ArrayList<Unpluggable> unpluggables) {
             mType = type;
-            mTimerPool = timerPool;
             unpluggables.add(this);
         }
+
+        protected abstract long computeRunTimeLocked(long curBatteryRealtime);
+        
+        protected abstract int computeCurrentCountLocked();
+        
         
         public void writeToParcel(Parcel out, long batteryRealtime) {
             out.writeInt(mCount);
@@ -326,7 +349,6 @@ public final class BatteryStatsImpl extends BatteryStats {
             out.writeLong(computeRunTimeLocked(batteryRealtime));
             out.writeLong(mLoadedTime);
             out.writeLong(mLastTime);
-            out.writeLong(mUpdateTime);
             out.writeLong(mUnpluggedTime);
         }
 
@@ -346,19 +368,15 @@ public final class BatteryStatsImpl extends BatteryStats {
         }
 
         public void plug(long batteryUptime, long batteryRealtime) {
-            if (mNesting > 0) {
-                if (DEBUG && mType < 0) {
-                    Log.v(TAG, "plug #" + mType + ": realtime=" + batteryRealtime
-                            + " old mTotalTime=" + mTotalTime
-                            + " old mUpdateTime=" + mUpdateTime);
-                }
-                mTotalTime = computeRunTimeLocked(batteryRealtime);
-                mUpdateTime = batteryRealtime;
-                if (DEBUG && mType < 0) {
-                    Log.v(TAG, "plug #" + mType
-                            + ": new mTotalTime=" + mTotalTime
-                            + " old mUpdateTime=" + mUpdateTime);
-                }
+            if (DEBUG && mType < 0) {
+                Log.v(TAG, "plug #" + mType + ": realtime=" + batteryRealtime
+                        + " old mTotalTime=" + mTotalTime);
+            }
+            mTotalTime = computeRunTimeLocked(batteryRealtime);
+            mCount = computeCurrentCountLocked();
+            if (DEBUG && mType < 0) {
+                Log.v(TAG, "plug #" + mType
+                        + ": new mTotalTime=" + mTotalTime);
             }
         }
         
@@ -380,7 +398,7 @@ public final class BatteryStatsImpl extends BatteryStats {
         }
 
         @Override
-        public long getTotalTime(long batteryRealtime, int which) {
+        public long getTotalTimeLocked(long batteryRealtime, int which) {
             long val;
             if (which == STATS_LAST) {
                 val = mLastTime;
@@ -397,12 +415,12 @@ public final class BatteryStatsImpl extends BatteryStats {
         }
 
         @Override
-        public int getCount(int which) {
+        public int getCountLocked(int which) {
             int val;
             if (which == STATS_LAST) {
                 val = mLastCount;
             } else {
-                val = mCount;
+                val = computeCurrentCountLocked();
                 if (which == STATS_UNPLUGGED) {
                     val -= mUnpluggedCount;
                 } else if (which != STATS_TOTAL) {
@@ -414,14 +432,239 @@ public final class BatteryStatsImpl extends BatteryStats {
         }
 
         public void logState(Printer pw, String prefix) {
-            pw.println(prefix + "mNesting=" + mNesting + " mCount=" + mCount
+            pw.println(prefix + " mCount=" + mCount
                     + " mLoadedCount=" + mLoadedCount + " mLastCount=" + mLastCount
                     + " mUnpluggedCount=" + mUnpluggedCount);
             pw.println(prefix + "mTotalTime=" + mTotalTime
                     + " mLoadedTime=" + mLoadedTime);
             pw.println(prefix + "mLastTime=" + mLastTime
                     + " mUnpluggedTime=" + mUnpluggedTime);
-            pw.println(prefix + "mUpdateTime=" + mUpdateTime
+        }
+        
+        
+        void writeSummaryFromParcelLocked(Parcel out, long batteryRealtime) {
+            long runTime = computeRunTimeLocked(batteryRealtime);
+            // Divide by 1000 for backwards compatibility
+            out.writeLong((runTime + 500) / 1000);
+            out.writeLong(((runTime - mLoadedTime) + 500) / 1000);
+            out.writeInt(mCount);
+            out.writeInt(mCount - mLoadedCount);
+        }
+
+        void readSummaryFromParcelLocked(Parcel in) {
+            // Multiply by 1000 for backwards compatibility
+            mTotalTime = mLoadedTime = in.readLong() * 1000;
+            mLastTime = in.readLong() * 1000;
+            mUnpluggedTime = mTotalTime;
+            mCount = mLoadedCount = in.readInt();
+            mLastCount = in.readInt();
+            mUnpluggedCount = mCount;
+        }
+    }
+    
+    public static final class SamplingTimer extends Timer {
+        
+        /**
+         * The most recent reported count from /proc/wakelocks.
+         */
+        int mCurrentReportedCount;
+
+        /**
+         * The reported count from /proc/wakelocks when unplug() was last
+         * called.
+         */
+        int mUnpluggedReportedCount;
+
+        /**
+         * The most recent reported total_time from /proc/wakelocks.
+         */ 
+        long mCurrentReportedTotalTime;
+
+
+        /**
+         * The reported total_time from /proc/wakelocks when unplug() was last
+         * called.
+         */
+        long mUnpluggedReportedTotalTime;
+
+        /**
+         * Whether we are currently in a discharge cycle.
+         */
+        boolean mInDischarge;
+
+        /**
+         * Whether we are currently recording reported values.
+         */
+        boolean mTrackingReportedValues;
+        
+        /*
+         * A sequnce counter, incremented once for each update of the stats.
+         */
+        int mUpdateVersion;
+        
+        SamplingTimer(ArrayList<Unpluggable> unpluggables, boolean inDischarge, Parcel in) {
+            super(0, unpluggables, in);
+            mCurrentReportedCount = in.readInt();
+            mUnpluggedReportedCount = in.readInt();
+            mCurrentReportedTotalTime = in.readLong();
+            mUnpluggedReportedTotalTime = in.readLong();
+            mTrackingReportedValues = in.readInt() == 1;
+            mInDischarge = inDischarge;
+        }
+        
+        SamplingTimer(ArrayList<Unpluggable> unpluggables, boolean inDischarge, 
+                boolean trackReportedValues) {
+            super(0, unpluggables);
+            mTrackingReportedValues = trackReportedValues;
+            mInDischarge = inDischarge;
+        }
+        
+        public void setStale() {
+            mTrackingReportedValues = false;
+            mUnpluggedReportedTotalTime = 0;
+            mUnpluggedReportedCount = 0;
+        }
+        
+        public void setUpdateVersion(int version) {
+            mUpdateVersion = version;
+        }
+        
+        public int getUpdateVersion() {
+            return mUpdateVersion;
+        }
+        
+        public void updateCurrentReportedCount(int count) {
+            if (mInDischarge && mUnpluggedReportedCount == 0) {
+                // Updating the reported value for the first time.
+                mUnpluggedReportedCount = count;
+                // If we are receiving an update update mTrackingReportedValues;
+                mTrackingReportedValues = true;
+            }
+            mCurrentReportedCount = count;
+        }
+        
+        public void updateCurrentReportedTotalTime(long totalTime) {
+            if (mInDischarge && mUnpluggedReportedTotalTime == 0) {
+                // Updating the reported value for the first time.
+                mUnpluggedReportedTotalTime = totalTime;
+                // If we are receiving an update update mTrackingReportedValues;
+                mTrackingReportedValues = true;
+            }
+            mCurrentReportedTotalTime = totalTime;
+        }
+        
+        public void unplug(long batteryUptime, long batteryRealtime) {
+            super.unplug(batteryUptime, batteryRealtime);
+            if (mTrackingReportedValues) {
+                mUnpluggedReportedTotalTime = mCurrentReportedTotalTime;
+                mUnpluggedReportedCount = mCurrentReportedCount;
+            }
+            mInDischarge = true;
+        }
+
+        public void plug(long batteryUptime, long batteryRealtime) {
+            super.plug(batteryUptime, batteryRealtime);
+            mInDischarge = false;
+        }
+        
+        public void logState(Printer pw, String prefix) {
+            super.logState(pw, prefix);
+            pw.println(prefix + "mCurrentReportedCount=" + mCurrentReportedCount 
+                    + " mUnpluggedReportedCount=" + mUnpluggedReportedCount
+                    + " mCurrentReportedTotalTime=" + mCurrentReportedTotalTime
+                    + " mUnpluggedReportedTotalTime=" + mUnpluggedReportedTotalTime);
+        }
+        
+        protected long computeRunTimeLocked(long curBatteryRealtime) {
+            return mTotalTime + (mInDischarge && mTrackingReportedValues 
+                    ? mCurrentReportedTotalTime - mUnpluggedReportedTotalTime : 0);
+        }
+        
+        protected int computeCurrentCountLocked() {
+            return mCount + (mInDischarge && mTrackingReportedValues
+                    ? mCurrentReportedCount - mUnpluggedReportedCount : 0);
+        }
+        
+        public void writeToParcel(Parcel out, long batteryRealtime) {
+            super.writeToParcel(out, batteryRealtime);
+            out.writeInt(mCurrentReportedCount);
+            out.writeInt(mUnpluggedReportedCount);
+            out.writeLong(mCurrentReportedTotalTime);
+            out.writeLong(mUnpluggedReportedTotalTime);
+            out.writeInt(mTrackingReportedValues ? 1 : 0);
+        }
+        
+        void writeSummaryFromParcelLocked(Parcel out, long batteryRealtime) {
+            super.writeSummaryFromParcelLocked(out, batteryRealtime);
+            out.writeLong(mCurrentReportedTotalTime);
+            out.writeInt(mCurrentReportedCount);
+            out.writeInt(mTrackingReportedValues ? 1 : 0);
+        }
+
+        void readSummaryFromParcelLocked(Parcel in) {
+            super.readSummaryFromParcelLocked(in);
+            mUnpluggedReportedTotalTime = mCurrentReportedTotalTime = in.readLong();
+            mUnpluggedReportedCount = mCurrentReportedCount = in.readInt();
+            mTrackingReportedValues = in.readInt() == 1;
+        }
+    }
+    
+    /**
+     * State for keeping track of timing information.
+     */
+    public static final class StopwatchTimer extends Timer {
+        final ArrayList<StopwatchTimer> mTimerPool;
+        int mNesting;
+
+
+        /**
+         * The last time at which we updated the timer.  If mNesting is > 0,
+         * subtract this from the current battery time to find the amount of
+         * time we have been running since we last computed an update.
+         */
+        long mUpdateTime;
+        
+        /**
+         * The total time at which the timer was acquired, to determine if
+         * was actually held for an interesting duration.
+         */
+        long mAcquireTime;
+        
+
+        StopwatchTimer(int type, ArrayList<StopwatchTimer> timerPool,
+                ArrayList<Unpluggable> unpluggables, Parcel in) {
+            super(type, unpluggables, in);
+            mTimerPool = timerPool;
+            mUpdateTime = in.readLong();
+        }
+
+        StopwatchTimer(int type, ArrayList<StopwatchTimer> timerPool,
+                ArrayList<Unpluggable> unpluggables) {
+            super(type, unpluggables);
+            mTimerPool = timerPool;
+        }
+        
+        public void writeToParcel(Parcel out, long batteryRealtime) {
+            super.writeToParcel(out, batteryRealtime);
+            out.writeLong(mUpdateTime);
+        }
+
+        public void plug(long batteryUptime, long batteryRealtime) {
+            if (mNesting > 0) {
+                if (DEBUG && mType < 0) {
+                    Log.v(TAG, "old mUpdateTime=" + mUpdateTime);
+                }
+                super.plug(batteryUptime, batteryRealtime);
+                mUpdateTime = batteryRealtime;
+                if (DEBUG && mType < 0) {
+                    Log.v(TAG, "new mUpdateTime=" + mUpdateTime);
+                }
+            }
+        }
+
+        public void logState(Printer pw, String prefix) {
+            super.logState(pw, prefix);
+            pw.println(prefix + "mNesting=" + mNesting + "mUpdateTime=" + mUpdateTime
                     + " mAcquireTime=" + mAcquireTime);
         }
         
@@ -484,12 +727,12 @@ public final class BatteryStatsImpl extends BatteryStats {
         // Update the total time for all other running Timers with the same type as this Timer
         // due to a change in timer count
         private static void refreshTimersLocked(final BatteryStatsImpl stats,
-                final ArrayList<Timer> pool) {
+                final ArrayList<StopwatchTimer> pool) {
             final long realtime = SystemClock.elapsedRealtime() * 1000; 
             final long batteryRealtime = stats.getBatteryRealtimeLocked(realtime);
             final int N = pool.size();
             for (int i=N-1; i>= 0; i--) {
-                final Timer t = pool.get(i);
+                final StopwatchTimer t = pool.get(i);
                 long heldTime = batteryRealtime - t.mUpdateTime;
                 if (heldTime > 0) {
                     t.mTotalTime += heldTime / N;
@@ -498,34 +741,146 @@ public final class BatteryStatsImpl extends BatteryStats {
             }
         }
 
-        private long computeRunTimeLocked(long curBatteryRealtime) {
+        @Override
+        protected long computeRunTimeLocked(long curBatteryRealtime) {
             return mTotalTime + (mNesting > 0
                     ? (curBatteryRealtime - mUpdateTime)
                             / (mTimerPool != null ? mTimerPool.size() : 1)
                     : 0);
         }
 
-        void writeSummaryFromParcelLocked(Parcel out, long batteryRealtime) {
-            long runTime = computeRunTimeLocked(batteryRealtime);
-            // Divide by 1000 for backwards compatibility
-            out.writeLong((runTime + 500) / 1000);
-            out.writeLong(((runTime - mLoadedTime) + 500) / 1000);
-            out.writeInt(mCount);
-            out.writeInt(mCount - mLoadedCount);
+        @Override
+        protected int computeCurrentCountLocked() {
+            return mCount;
         }
 
         void readSummaryFromParcelLocked(Parcel in) {
-            // Multiply by 1000 for backwards compatibility
-            mTotalTime = mLoadedTime = in.readLong() * 1000;
-            mLastTime = in.readLong() * 1000;
-            mUnpluggedTime = mTotalTime;
-            mCount = mLoadedCount = in.readInt();
-            mLastCount = in.readInt();
-            mUnpluggedCount = mCount;
+            super.readSummaryFromParcelLocked(in);
             mNesting = 0;
         }
     }
     
+    private final Map<String, KernelWakelockStats> readKernelWakelockStats() {
+        
+        byte[] buffer = new byte[4096];
+        int len;
+        
+        try {
+            FileInputStream is = new FileInputStream("/proc/wakelocks");
+            len = is.read(buffer);
+            is.close();
+
+            if (len > 0) {
+                int i;
+                for (i=0; i<len; i++) {
+                    if (buffer[i] == '\0') {
+                        len = i;
+                        break;
+                    }
+                }
+            }
+        } catch (java.io.FileNotFoundException e) {
+            return null;
+        } catch (java.io.IOException e) {
+            return null;
+        }
+        
+        return parseProcWakelocks(buffer, len);
+    }
+    
+    private final Map<String, KernelWakelockStats> parseProcWakelocks(
+            byte[] wlBuffer, int len) {
+        String name;
+        int count;
+        long totalTime;
+        int startIndex, endIndex;
+        int numUpdatedWlNames = 0;
+
+        // Advance past the first line.
+        int i;
+        for (i = 0; i < len && wlBuffer[i] != '\n' && wlBuffer[i] != '\0'; i++);
+        startIndex = endIndex = i + 1;
+
+        synchronized(this) {
+            Map<String, KernelWakelockStats> m = mProcWakelockFileStats;
+            
+            sKernelWakelockUpdateVersion++;
+            while (endIndex < len) {
+                for (endIndex=startIndex; 
+                        endIndex < len && wlBuffer[endIndex] != '\n' && wlBuffer[endIndex] != '\0'; 
+                        endIndex++);
+                endIndex++; // endIndex is an exclusive upper bound.
+
+                String[] nameStringArray = mProcWakelocksName;
+                long[] wlData = mProcWakelocksData;
+                Process.parseProcLine(wlBuffer, startIndex, endIndex, PROC_WAKELOCKS_FORMAT, 
+                        nameStringArray, wlData, null);
+                
+                name = nameStringArray[0];
+                count = (int) wlData[1];
+                // convert nanoseconds to microseconds with rounding.
+                totalTime = (wlData[2] + 500) / 1000;
+
+                if (name.length() > 0) {
+                    if (!m.containsKey(name)) {
+                        m.put(name, new KernelWakelockStats(count, totalTime, 
+                                sKernelWakelockUpdateVersion));
+                        numUpdatedWlNames++;
+                    } else {
+                        KernelWakelockStats kwlStats = m.get(name);
+                        if (kwlStats.mVersion == sKernelWakelockUpdateVersion) {
+                            kwlStats.mCount += count;
+                            kwlStats.mTotalTime += totalTime;
+                        } else {
+                            kwlStats.mCount = count;
+                            kwlStats.mTotalTime = totalTime;
+                            kwlStats.mVersion = sKernelWakelockUpdateVersion;
+                            numUpdatedWlNames++;
+                        }
+                    }
+                }              
+                startIndex = endIndex;
+            }
+
+            if (m.size() != numUpdatedWlNames) {
+                // Don't report old data.
+                Iterator<KernelWakelockStats> itr = m.values().iterator();
+                while (itr.hasNext()) {
+                    if (itr.next().mVersion != sKernelWakelockUpdateVersion) {
+                        itr.remove();
+                    }
+                }
+            }
+            return m;
+        }
+    }
+    
+    private class KernelWakelockStats {
+        public int mCount;
+        public long mTotalTime;
+        public int mVersion;
+        
+        KernelWakelockStats(int count, long totalTime, int version) {
+            mCount = count;
+            mTotalTime = totalTime;
+            mVersion = version;
+        }
+    }
+    
+    /*
+     * Get the KernelWakelockTimer associated with name, and create a new one if one 
+     * doesn't already exist.
+     */
+    public SamplingTimer getKernelWakelockTimerLocked(String name) {
+        SamplingTimer kwlt = mKernelWakelockStats.get(name);
+        if (kwlt == null) {
+            kwlt = new SamplingTimer(mUnpluggables, mOnBatteryInternal, 
+                    true /* track reported values */);
+            mKernelWakelockStats.put(name, kwlt);
+        }
+        return kwlt;
+    }
+    
     public void doUnplug(long batteryUptime, long batteryRealtime) {
         for (int iu = mUidStats.size() - 1; iu >= 0; iu--) {
             Uid u = mUidStats.valueAt(iu);
@@ -760,53 +1115,53 @@ public final class BatteryStatsImpl extends BatteryStats {
     }
     
     @Override public long getScreenOnTime(long batteryRealtime, int which) {
-        return mScreenOnTimer.getTotalTime(batteryRealtime, which);
+        return mScreenOnTimer.getTotalTimeLocked(batteryRealtime, which);
     }
     
     @Override public long getScreenBrightnessTime(int brightnessBin,
             long batteryRealtime, int which) {
-        return mScreenBrightnessTimer[brightnessBin].getTotalTime(
+        return mScreenBrightnessTimer[brightnessBin].getTotalTimeLocked(
                 batteryRealtime, which);
     }
     
     @Override public int getInputEventCount(int which) {
-        return mInputEventCounter.getCount(which);
+        return mInputEventCounter.getCountLocked(which);
     }
     
     @Override public long getPhoneOnTime(long batteryRealtime, int which) {
-        return mPhoneOnTimer.getTotalTime(batteryRealtime, which);
+        return mPhoneOnTimer.getTotalTimeLocked(batteryRealtime, which);
     }
     
     @Override public long getPhoneSignalStrengthTime(int strengthBin,
             long batteryRealtime, int which) {
-        return mPhoneSignalStrengthsTimer[strengthBin].getTotalTime(
+        return mPhoneSignalStrengthsTimer[strengthBin].getTotalTimeLocked(
                 batteryRealtime, which);
     }
     
     @Override public int getPhoneSignalStrengthCount(int dataType, int which) {
-        return mPhoneDataConnectionsTimer[dataType].getCount(which);
+        return mPhoneDataConnectionsTimer[dataType].getCountLocked(which);
     }
     
     @Override public long getPhoneDataConnectionTime(int dataType,
             long batteryRealtime, int which) {
-        return mPhoneDataConnectionsTimer[dataType].getTotalTime(
+        return mPhoneDataConnectionsTimer[dataType].getTotalTimeLocked(
                 batteryRealtime, which);
     }
     
     @Override public int getPhoneDataConnectionCount(int dataType, int which) {
-        return mPhoneDataConnectionsTimer[dataType].getCount(which);
+        return mPhoneDataConnectionsTimer[dataType].getCountLocked(which);
     }
     
     @Override public long getWifiOnTime(long batteryRealtime, int which) {
-        return mWifiOnTimer.getTotalTime(batteryRealtime, which);
+        return mWifiOnTimer.getTotalTimeLocked(batteryRealtime, which);
     }
     
     @Override public long getWifiRunningTime(long batteryRealtime, int which) {
-        return mWifiRunningTimer.getTotalTime(batteryRealtime, which);
+        return mWifiRunningTimer.getTotalTimeLocked(batteryRealtime, which);
     }
 
     @Override public long getBluetoothOnTime(long batteryRealtime, int which) {
-        return mBluetoothOnTimer.getTotalTime(batteryRealtime, which);
+        return mBluetoothOnTimer.getTotalTimeLocked(batteryRealtime, which);
     }
     
     @Override public boolean getIsOnBattery() {
@@ -836,13 +1191,13 @@ public final class BatteryStatsImpl extends BatteryStats {
         long mStartedTcpBytesSent = -1;
         
         boolean mWifiTurnedOn;
-        Timer mWifiTurnedOnTimer;
+        StopwatchTimer mWifiTurnedOnTimer;
         
         boolean mFullWifiLockOut;
-        Timer mFullWifiLockTimer;
+        StopwatchTimer mFullWifiLockTimer;
         
         boolean mScanWifiLockOut;
-        Timer mScanWifiLockTimer;
+        StopwatchTimer mScanWifiLockTimer;
         
         Counter[] mUserActivityCounters;
         
@@ -868,9 +1223,9 @@ public final class BatteryStatsImpl extends BatteryStats {
         
         public Uid(int uid) {
             mUid = uid;
-            mWifiTurnedOnTimer = new Timer(WIFI_TURNED_ON, null, mUnpluggables);
-            mFullWifiLockTimer = new Timer(FULL_WIFI_LOCK, null, mUnpluggables);
-            mScanWifiLockTimer = new Timer(SCAN_WIFI_LOCK, null, mUnpluggables);
+            mWifiTurnedOnTimer = new StopwatchTimer(WIFI_TURNED_ON, null, mUnpluggables);
+            mFullWifiLockTimer = new StopwatchTimer(FULL_WIFI_LOCK, null, mUnpluggables);
+            mScanWifiLockTimer = new StopwatchTimer(SCAN_WIFI_LOCK, null, mUnpluggables);
         }
 
         @Override
@@ -980,17 +1335,17 @@ public final class BatteryStatsImpl extends BatteryStats {
         
         @Override 
         public long getWifiTurnedOnTime(long batteryRealtime, int which) {
-            return mWifiTurnedOnTimer.getTotalTime(batteryRealtime, which);
+            return mWifiTurnedOnTimer.getTotalTimeLocked(batteryRealtime, which);
         }
         
         @Override 
         public long getFullWifiLockTime(long batteryRealtime, int which) {
-            return mFullWifiLockTimer.getTotalTime(batteryRealtime, which);
+            return mFullWifiLockTimer.getTotalTimeLocked(batteryRealtime, which);
         }
         
         @Override 
         public long getScanWifiLockTime(long batteryRealtime, int which) {
-            return mScanWifiLockTimer.getTotalTime(batteryRealtime, which);
+            return mScanWifiLockTimer.getTotalTimeLocked(batteryRealtime, which);
         }
         
         @Override
@@ -1013,7 +1368,7 @@ public final class BatteryStatsImpl extends BatteryStats {
             if (mUserActivityCounters == null) {
                 return 0;
             }
-            return mUserActivityCounters[type].getCount(which);
+            return mUserActivityCounters[type].getCountLocked(which);
         }
         
         void initUserActivityLocked() {
@@ -1120,11 +1475,11 @@ public final class BatteryStatsImpl extends BatteryStats {
             mTcpBytesReceivedAtLastUnplug = in.readLong();
             mTcpBytesSentAtLastUnplug = in.readLong();
             mWifiTurnedOn = false;
-            mWifiTurnedOnTimer = new Timer(WIFI_TURNED_ON, null, mUnpluggables, in);
+            mWifiTurnedOnTimer = new StopwatchTimer(WIFI_TURNED_ON, null, mUnpluggables, in);
             mFullWifiLockOut = false;
-            mFullWifiLockTimer = new Timer(FULL_WIFI_LOCK, null, mUnpluggables, in);
+            mFullWifiLockTimer = new StopwatchTimer(FULL_WIFI_LOCK, null, mUnpluggables, in);
             mScanWifiLockOut = false;
-            mScanWifiLockTimer = new Timer(SCAN_WIFI_LOCK, null, mUnpluggables, in);
+            mScanWifiLockTimer = new StopwatchTimer(SCAN_WIFI_LOCK, null, mUnpluggables, in);
             if (in.readInt() == 0) {
                 mUserActivityCounters = null;
             } else {
@@ -1142,17 +1497,17 @@ public final class BatteryStatsImpl extends BatteryStats {
             /**
              * How long (in ms) this uid has been keeping the device partially awake.
              */
-            Timer mTimerPartial;
+            StopwatchTimer mTimerPartial;
 
             /**
              * How long (in ms) this uid has been keeping the device fully awake.
              */
-            Timer mTimerFull;
+            StopwatchTimer mTimerFull;
 
             /**
              * How long (in ms) this uid has had a window keeping the device awake.
              */
-            Timer mTimerWindow;
+            StopwatchTimer mTimerWindow;
 
             /**
              * Reads a possibly null Timer from a Parcel.  The timer is associated with the
@@ -1161,13 +1516,13 @@ public final class BatteryStatsImpl extends BatteryStats {
              * @param in the Parcel to be read from.
              * return a new Timer, or null.
              */
-            private Timer readTimerFromParcel(int type, ArrayList<Timer> pool,
+            private StopwatchTimer readTimerFromParcel(int type, ArrayList<StopwatchTimer> pool,
                     ArrayList<Unpluggable> unpluggables, Parcel in) {
                 if (in.readInt() == 0) {
                     return null;
                 }
 
-                return new Timer(type, pool, unpluggables, in);
+                return new StopwatchTimer(type, pool, unpluggables, in);
             }
 
             void readFromParcelLocked(ArrayList<Unpluggable> unpluggables, Parcel in) {
@@ -1198,24 +1553,24 @@ public final class BatteryStatsImpl extends BatteryStats {
 
         public final class Sensor extends BatteryStats.Uid.Sensor {
             final int mHandle;
-            Timer mTimer;
+            StopwatchTimer mTimer;
             
             public Sensor(int handle) {
                 mHandle = handle;
             }
 
-            private Timer readTimerFromParcel(ArrayList<Unpluggable> unpluggables,
+            private StopwatchTimer readTimerFromParcel(ArrayList<Unpluggable> unpluggables,
                     Parcel in) {
                 if (in.readInt() == 0) {
                     return null;
                 }
 
-                ArrayList<Timer> pool = mSensorTimers.get(mHandle);
+                ArrayList<StopwatchTimer> pool = mSensorTimers.get(mHandle);
                 if (pool == null) {
-                    pool = new ArrayList<Timer>();
+                    pool = new ArrayList<StopwatchTimer>();
                     mSensorTimers.put(mHandle, pool);
                 }
-                return new Timer(0, pool, unpluggables, in);
+                return new StopwatchTimer(0, pool, unpluggables, in);
             }
 
             void readFromParcelLocked(ArrayList<Unpluggable> unpluggables, Parcel in) {
@@ -1816,32 +2171,32 @@ public final class BatteryStatsImpl extends BatteryStats {
             return ss;
         }
 
-        public Timer getWakeTimerLocked(String name, int type) {
+        public StopwatchTimer getWakeTimerLocked(String name, int type) {
             Wakelock wl = mWakelockStats.get(name);
             if (wl == null) {
                 wl = new Wakelock();
                 mWakelockStats.put(name, wl);
             }
-            Timer t = null;
+            StopwatchTimer t = null;
             switch (type) {
                 case WAKE_TYPE_PARTIAL:
                     t = wl.mTimerPartial;
                     if (t == null) {
-                        t = new Timer(WAKE_TYPE_PARTIAL, mPartialTimers, mUnpluggables);
+                        t = new StopwatchTimer(WAKE_TYPE_PARTIAL, mPartialTimers, mUnpluggables);
                         wl.mTimerPartial = t;
                     }
                     return t;
                 case WAKE_TYPE_FULL:
                     t = wl.mTimerFull;
                     if (t == null) {
-                        t = new Timer(WAKE_TYPE_FULL, mFullTimers, mUnpluggables);
+                        t = new StopwatchTimer(WAKE_TYPE_FULL, mFullTimers, mUnpluggables);
                         wl.mTimerFull = t;
                     }
                     return t;
                 case WAKE_TYPE_WINDOW:
                     t = wl.mTimerWindow;
                     if (t == null) {
-                        t = new Timer(WAKE_TYPE_WINDOW, mWindowTimers, mUnpluggables);
+                        t = new StopwatchTimer(WAKE_TYPE_WINDOW, mWindowTimers, mUnpluggables);
                         wl.mTimerWindow = t;
                     }
                     return t;
@@ -1850,7 +2205,7 @@ public final class BatteryStatsImpl extends BatteryStats {
             }
         }
 
-        public Timer getSensorTimerLocked(int sensor, boolean create) {
+        public StopwatchTimer getSensorTimerLocked(int sensor, boolean create) {
             Sensor se = mSensorStats.get(sensor);
             if (se == null) {
                 if (!create) {
@@ -1859,36 +2214,36 @@ public final class BatteryStatsImpl extends BatteryStats {
                 se = new Sensor(sensor);
                 mSensorStats.put(sensor, se);
             }
-            Timer t = se.mTimer;
+            StopwatchTimer t = se.mTimer;
             if (t != null) {
                 return t;
             }
-            ArrayList<Timer> timers = mSensorTimers.get(sensor);
+            ArrayList<StopwatchTimer> timers = mSensorTimers.get(sensor);
             if (timers == null) {
-                timers = new ArrayList<Timer>();
+                timers = new ArrayList<StopwatchTimer>();
                 mSensorTimers.put(sensor, timers);
             }
-            t = new Timer(BatteryStats.SENSOR, timers, mUnpluggables);
+            t = new StopwatchTimer(BatteryStats.SENSOR, timers, mUnpluggables);
             se.mTimer = t;
             return t;
         }
 
         public void noteStartWakeLocked(String name, int type) {
-            Timer t = getWakeTimerLocked(name, type);
+            StopwatchTimer t = getWakeTimerLocked(name, type);
             if (t != null) {
                 t.startRunningLocked(BatteryStatsImpl.this);
             }
         }
 
         public void noteStopWakeLocked(String name, int type) {
-            Timer t = getWakeTimerLocked(name, type);
+            StopwatchTimer t = getWakeTimerLocked(name, type);
             if (t != null) {
                 t.stopRunningLocked(BatteryStatsImpl.this);
             }
         }
         
         public void noteStartSensor(int sensor) {
-            Timer t = getSensorTimerLocked(sensor, true);
+            StopwatchTimer t = getSensorTimerLocked(sensor, true);
             if (t != null) {
                 t.startRunningLocked(BatteryStatsImpl.this);
             }            
@@ -1896,21 +2251,21 @@ public final class BatteryStatsImpl extends BatteryStats {
 
         public void noteStopSensor(int sensor) {
             // Don't create a timer if one doesn't already exist
-            Timer t = getSensorTimerLocked(sensor, false);
+            StopwatchTimer t = getSensorTimerLocked(sensor, false);
             if (t != null) {
                 t.stopRunningLocked(BatteryStatsImpl.this);
             }            
         }
         
         public void noteStartGps() {
-            Timer t = getSensorTimerLocked(Sensor.GPS, true);
+            StopwatchTimer t = getSensorTimerLocked(Sensor.GPS, true);
             if (t != null) {
                 t.startRunningLocked(BatteryStatsImpl.this);
             }  
         }
         
         public void noteStopGps() {
-            Timer t = getSensorTimerLocked(Sensor.GPS, false);
+            StopwatchTimer t = getSensorTimerLocked(Sensor.GPS, false);
             if (t != null) {
                 t.stopRunningLocked(BatteryStatsImpl.this);
             }  
@@ -1925,21 +2280,21 @@ public final class BatteryStatsImpl extends BatteryStats {
         mFile = new File(filename);
         mBackupFile = new File(filename + ".bak");
         mStartCount++;
-        mScreenOnTimer = new Timer(-1, null, mUnpluggables);
+        mScreenOnTimer = new StopwatchTimer(-1, null, mUnpluggables);
         for (int i=0; i<NUM_SCREEN_BRIGHTNESS_BINS; i++) {
-            mScreenBrightnessTimer[i] = new Timer(-100-i, null, mUnpluggables);
+            mScreenBrightnessTimer[i] = new StopwatchTimer(-100-i, null, mUnpluggables);
         }
         mInputEventCounter = new Counter(mUnpluggables);
-        mPhoneOnTimer = new Timer(-2, null, mUnpluggables);
+        mPhoneOnTimer = new StopwatchTimer(-2, null, mUnpluggables);
         for (int i=0; i<NUM_SIGNAL_STRENGTH_BINS; i++) {
-            mPhoneSignalStrengthsTimer[i] = new Timer(-200-i, null, mUnpluggables);
+            mPhoneSignalStrengthsTimer[i] = new StopwatchTimer(-200-i, null, mUnpluggables);
         }
         for (int i=0; i<NUM_DATA_CONNECTION_TYPES; i++) {
-            mPhoneDataConnectionsTimer[i] = new Timer(-300-i, null, mUnpluggables);
+            mPhoneDataConnectionsTimer[i] = new StopwatchTimer(-300-i, null, mUnpluggables);
         }
-        mWifiOnTimer = new Timer(-3, null, mUnpluggables);
-        mWifiRunningTimer = new Timer(-4, null, mUnpluggables);
-        mBluetoothOnTimer = new Timer(-5, null, mUnpluggables);
+        mWifiOnTimer = new StopwatchTimer(-3, null, mUnpluggables);
+        mWifiRunningTimer = new StopwatchTimer(-4, null, mUnpluggables);
+        mBluetoothOnTimer = new StopwatchTimer(-5, null, mUnpluggables);
         mOnBattery = mOnBatteryInternal = false;
         mTrackBatteryPastUptime = 0;
         mTrackBatteryPastRealtime = 0;
@@ -1967,6 +2322,7 @@ public final class BatteryStatsImpl extends BatteryStats {
 
     public void setOnBattery(boolean onBattery, int level) {
         synchronized(this) {
+            updateKernelWakelocksLocked();
             if (mOnBattery != onBattery) {
                 mOnBattery = mOnBatteryInternal = onBattery;
                 
@@ -1998,6 +2354,35 @@ public final class BatteryStatsImpl extends BatteryStats {
     public void recordCurrentLevel(int level) {
         mDischargeCurrentLevel = level;
     }
+    
+    public void updateKernelWakelocksLocked() {
+        Map<String, KernelWakelockStats> m = readKernelWakelockStats();
+        
+        for (Map.Entry<String, KernelWakelockStats> ent : m.entrySet()) {
+            String name = ent.getKey();
+            KernelWakelockStats kws = ent.getValue();
+        
+            SamplingTimer kwlt = mKernelWakelockStats.get(name);
+            if (kwlt == null) {
+                kwlt = new SamplingTimer(mUnpluggables, mOnBatteryInternal, 
+                        true /* track reported values */);
+                mKernelWakelockStats.put(name, kwlt);
+            }
+            kwlt.updateCurrentReportedCount(kws.mCount);
+            kwlt.updateCurrentReportedTotalTime(kws.mTotalTime);
+            kwlt.setUpdateVersion(sKernelWakelockUpdateVersion);
+        }
+        
+        if (m.size() != mKernelWakelockStats.size()) {
+            // Set timers to stale if they didn't appear in /proc/wakelocks this time.
+            for (Map.Entry<String, SamplingTimer> ent : mKernelWakelockStats.entrySet()) {
+                SamplingTimer st = ent.getValue();
+                if (st.getUpdateVersion() != sKernelWakelockUpdateVersion) {
+                    st.setStale();
+                }
+            }
+        }
+    }
 
     public long getAwakeTimeBattery() {
         return computeBatteryUptime(getBatteryUptimeLocked(), STATS_CURRENT);
@@ -2296,6 +2681,14 @@ public final class BatteryStatsImpl extends BatteryStats {
         mBluetoothOn = false;
         mBluetoothOnTimer.readSummaryFromParcelLocked(in);
 
+        int NKW = in.readInt();
+        for (int ikw = 0; ikw < NKW; ikw++) {
+            if (in.readInt() != 0) {
+                String kwltName = in.readString();
+                getKernelWakelockTimerLocked(kwltName).readSummaryFromParcelLocked(in);
+            }
+        }
+        
         final int NU = in.readInt();
         for (int iu = 0; iu < NU; iu++) {
             int uid = in.readInt();
@@ -2420,6 +2813,18 @@ public final class BatteryStatsImpl extends BatteryStats {
         mWifiRunningTimer.writeSummaryFromParcelLocked(out, NOWREAL);
         mBluetoothOnTimer.writeSummaryFromParcelLocked(out, NOWREAL);
 
+        out.writeInt(mKernelWakelockStats.size());
+        for (Map.Entry<String, SamplingTimer> ent : mKernelWakelockStats.entrySet()) {
+            Timer kwlt = ent.getValue();
+            if (kwlt != null) {
+                out.writeInt(1);
+                out.writeString(ent.getKey());
+                ent.getValue().writeSummaryFromParcelLocked(out, NOWREAL);
+            } else {
+                out.writeInt(0);
+            }
+        }
+        
         final int NU = mUidStats.size();
         out.writeInt(NU);
         for (int iu = 0; iu < NU; iu++) {
@@ -2548,25 +2953,25 @@ public final class BatteryStatsImpl extends BatteryStats {
         mBatteryRealtime = in.readLong();
         mBatteryLastRealtime = in.readLong();
         mScreenOn = false;
-        mScreenOnTimer = new Timer(-1, null, mUnpluggables, in);
+        mScreenOnTimer = new StopwatchTimer(-1, null, mUnpluggables, in);
         for (int i=0; i<NUM_SCREEN_BRIGHTNESS_BINS; i++) {
-            mScreenBrightnessTimer[i] = new Timer(-100-i, null, mUnpluggables, in);
+            mScreenBrightnessTimer[i] = new StopwatchTimer(-100-i, null, mUnpluggables, in);
         }
         mInputEventCounter = new Counter(mUnpluggables, in);
         mPhoneOn = false;
-        mPhoneOnTimer = new Timer(-2, null, mUnpluggables, in);
+        mPhoneOnTimer = new StopwatchTimer(-2, null, mUnpluggables, in);
         for (int i=0; i<NUM_SIGNAL_STRENGTH_BINS; i++) {
-            mPhoneSignalStrengthsTimer[i] = new Timer(-200-i, null, mUnpluggables, in);
+            mPhoneSignalStrengthsTimer[i] = new StopwatchTimer(-200-i, null, mUnpluggables, in);
         }
         for (int i=0; i<NUM_DATA_CONNECTION_TYPES; i++) {
-            mPhoneDataConnectionsTimer[i] = new Timer(-300-i, null, mUnpluggables, in);
+            mPhoneDataConnectionsTimer[i] = new StopwatchTimer(-300-i, null, mUnpluggables, in);
         }
         mWifiOn = false;
-        mWifiOnTimer = new Timer(-2, null, mUnpluggables, in);
+        mWifiOnTimer = new StopwatchTimer(-2, null, mUnpluggables, in);
         mWifiRunning = false;
-        mWifiRunningTimer = new Timer(-2, null, mUnpluggables, in);
+        mWifiRunningTimer = new StopwatchTimer(-2, null, mUnpluggables, in);
         mBluetoothOn = false;
-        mBluetoothOnTimer = new Timer(-2, null, mUnpluggables, in);
+        mBluetoothOnTimer = new StopwatchTimer(-2, null, mUnpluggables, in);
         mUptime = in.readLong();
         mUptimeStart = in.readLong();
         mLastUptime = in.readLong();
@@ -2585,6 +2990,16 @@ public final class BatteryStatsImpl extends BatteryStats {
         mDischargeCurrentLevel = in.readInt();
         mLastWriteTime = in.readLong();
 
+        mKernelWakelockStats.clear();
+        int NKW = in.readInt();
+        for (int ikw = 0; ikw < NKW; ikw++) {
+            if (in.readInt() != 0) {
+                String wakelockName = in.readString();
+                SamplingTimer kwlt = new SamplingTimer(mUnpluggables, mOnBattery, in);
+                mKernelWakelockStats.put(wakelockName, kwlt);
+            }
+        }
+        
         mPartialTimers.clear();
         mFullTimers.clear();
         mWindowTimers.clear();
@@ -2648,6 +3063,18 @@ public final class BatteryStatsImpl extends BatteryStats {
         out.writeInt(mDischargeCurrentLevel);
         out.writeLong(mLastWriteTime);
 
+        out.writeInt(mKernelWakelockStats.size());
+        for (Map.Entry<String, SamplingTimer> ent : mKernelWakelockStats.entrySet()) {
+            SamplingTimer kwlt = ent.getValue();
+            if (kwlt != null) {
+                out.writeInt(1);
+                out.writeString(ent.getKey());
+                Timer.writeTimerToParcel(out, kwlt, batteryRealtime);
+            } else {
+                out.writeInt(0);
+            }
+        }
+        
         int size = mUidStats.size();
         out.writeInt(size);
         for (int i = 0; i < size; i++) {
diff --git a/core/java/com/android/internal/util/BitwiseInputStream.java b/core/java/com/android/internal/util/BitwiseInputStream.java
new file mode 100644
index 000000000000..4757919f23f5
--- /dev/null
+++ b/core/java/com/android/internal/util/BitwiseInputStream.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.internal.util;
+
+/**
+ * An object that provides bitwise incremental read access to a byte array.
+ *
+ * This is useful, for example, when accessing a series of fields that
+ * may not be aligned on byte boundaries.
+ *
+ * NOTE -- This class is not threadsafe.
+ */
+public class BitwiseInputStream {
+
+    // The byte array being read from.
+    private byte[] mBuf;
+
+    // The current position offset, in bits, from the msb in byte 0.
+    private int mPos;
+
+    // The last valid bit offset.
+    private int mEnd;
+
+    /**
+     * An exception to report access problems.
+     */
+    public static class AccessException extends Exception {
+        public AccessException(String s) {
+            super("BitwiseInputStream access failed: " + s);
+        }
+    }
+
+    /**
+     * Create object from byte array.
+     *
+     * @param buf a byte array containing data
+     */
+    public BitwiseInputStream(byte buf[]) {
+        mBuf = buf;
+        mEnd = buf.length << 3;
+        mPos = 0;
+    }
+
+    /**
+     * Return the number of bit still available for reading.
+     */
+    public int available() {
+        return mEnd - mPos;
+    }
+
+    /**
+     * Read some data and increment the current position.
+     *
+     * @param bits the amount of data to read (gte 0, lte 8)
+     *
+     * @return byte of read data (possibly partially filled, from lsb)
+     */
+    public byte read(int bits) throws AccessException {
+        int index = mPos >>> 3;
+        int offset = 16 - (mPos & 0x07) - bits;  // &7==%8
+        if ((bits < 0) || (bits > 8) || ((mPos + bits) > mEnd)) {
+            throw new AccessException("illegal read " +
+                "(pos " + mPos + ", end " + mEnd + ", bits " + bits + ")");
+        }
+        int data = (mBuf[index] & 0x00FF) << 8;
+        if (offset < 8) data |= (mBuf[index + 1] & 0xFF);
+        data >>>= offset;
+        data &= (-1 >>> (32 - bits));
+        mPos += bits;
+        return (byte)data;
+    }
+
+    /**
+     * Read data in bulk into a byte array and increment the current position.
+     *
+     * @param bits the amount of data to read
+     *
+     * @return newly allocated byte array of read data
+     */
+    public byte[] readByteArray(int bits) throws AccessException {
+        int bytes = (bits >>> 3) + ((bits & 0x07) > 0 ? 1 : 0);  // &7==%8
+        byte[] arr = new byte[bytes];
+        for (int i = 0; i < bytes; i++) {
+            int increment = Math.min(8, bits - (i << 3));
+            arr[i] = (byte)(read(increment) << (8 - increment));
+        }
+        return arr;
+    }
+
+    /**
+     * Increment the current position and ignore contained data.
+     *
+     * @param bits the amount by which to increment the position
+     */
+    public void skip(int bits) throws AccessException {
+        if ((mPos + bits) > mEnd) {
+            throw new AccessException("illegal skip " +
+                "(pos " + mPos + ", end " + mEnd + ", bits " + bits + ")");
+        }
+        mPos += bits;
+    }
+}
diff --git a/core/java/com/android/internal/util/BitwiseOutputStream.java b/core/java/com/android/internal/util/BitwiseOutputStream.java
new file mode 100644
index 000000000000..17f5c7ca7f3f
--- /dev/null
+++ b/core/java/com/android/internal/util/BitwiseOutputStream.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.internal.util;
+
+/**
+ * An object that rovides bitwise incremental write access to a byte array.
+ *
+ * This is useful, for example, when writing a series of fields that
+ * may not be aligned on byte boundaries.
+ *
+ * NOTE -- This class is not threadsafe.
+ */
+public class BitwiseOutputStream {
+
+    // The byte array being written to, which will be grown as needed.
+    private byte[] mBuf;
+
+    // The current position offset, in bits, from the msb in byte 0.
+    private int mPos;
+
+    // The last bit offset, given the current buf length.
+    private int mEnd;
+
+    /**
+     * An exception to report access problems.
+     */
+    public static class AccessException extends Exception {
+        public AccessException(String s) {
+            super("BitwiseOutputStream access failed: " + s);
+        }
+    }
+
+    /**
+     * Create object from hint at desired size.
+     *
+     * @param startingLength initial internal byte array length in bytes
+     */
+    public BitwiseOutputStream(int startingLength) {
+        mBuf = new byte[startingLength];
+        mEnd = startingLength << 3;
+        mPos = 0;
+    }
+
+    /**
+     * Return byte array containing accumulated data, sized to just fit.
+     *
+     * @return newly allocated byte array
+     */
+    public byte[] toByteArray() {
+        int len = (mPos >>> 3) + ((mPos & 0x07) > 0 ? 1 : 0);  // &7==%8
+        byte[] newBuf = new byte[len];
+        System.arraycopy(mBuf, 0, newBuf, 0, len);
+        return newBuf;
+    }
+
+    /**
+     * Allocate a new internal buffer, if needed.
+     *
+     * @param bits additional bits to be accommodated
+     */
+    private void possExpand(int bits) {
+        if ((mPos + bits) < mEnd) return;
+        byte[] newBuf = new byte[(mPos + bits) >>> 2];
+        System.arraycopy(mBuf, 0, newBuf, 0, mEnd >>> 3);
+        mBuf = newBuf;
+    }
+
+    /**
+     * Write some data and increment the current position.
+     *
+     * @param bits the amount of data to write (gte 0, lte 8)
+     * @param data to write, will be masked to expose only bits param from lsb
+     */
+    public void write(int bits, int data) throws AccessException {
+        if ((bits < 0) || (bits > 8)) {
+            throw new AccessException("illegal write (" + bits + " bits)");
+        }
+        possExpand(bits);
+        data &= (-1 >>> (32 - bits));
+        int index = mPos >>> 3;
+        int offset = 16 - (mPos & 0x07) - bits;  // &7==%8
+        data <<= offset;
+        mPos += bits;
+        mBuf[index] |= (data >>> 8);
+        if (offset < 8) mBuf[index + 1] |= (data & 0x00FF);
+    }
+
+    /**
+     * Write data in bulk from a byte array and increment the current position.
+     *
+     * @param bits the amount of data to write
+     * @param arr the byte array containing data to be written
+     */
+    public void writeByteArray(int bits, byte[] arr) throws AccessException {
+        for (int i = 0; i < arr.length; i++) {
+            int increment = Math.min(8, bits - (i << 3));
+            if (increment > 0) {
+                write(increment, (byte)(arr[i] >>> (8 - increment)));
+            }
+        }
+    }
+
+    /**
+     * Increment the current position, implicitly writing zeros.
+     *
+     * @param bits the amount by which to increment the position
+     */
+    public void skip(int bits) {
+        possExpand(bits);
+        mPos += bits;
+    }
+}
diff --git a/core/jni/android_location_GpsLocationProvider.cpp b/core/jni/android_location_GpsLocationProvider.cpp
index f0b35e977ef1..bbde8d50f3df 100644
--- a/core/jni/android_location_GpsLocationProvider.cpp
+++ b/core/jni/android_location_GpsLocationProvider.cpp
@@ -31,6 +31,7 @@ static pthread_cond_t sEventCond = PTHREAD_COND_INITIALIZER;
 static jmethodID method_reportLocation;
 static jmethodID method_reportStatus;
 static jmethodID method_reportSvStatus;
+static jmethodID method_reportSuplStatus;
 static jmethodID method_xtraDownloadRequest;
 
 static const GpsInterface* sGpsInterface = NULL;
@@ -41,19 +42,22 @@ static const GpsSuplInterface* sGpsSuplInterface = NULL;
 static GpsLocation  sGpsLocation;
 static GpsStatus    sGpsStatus;
 static GpsSvStatus  sGpsSvStatus;
+static GpsSuplStatus    sGpsSuplStatus;
 
 // a copy of the data shared by android_location_GpsLocationProvider_wait_for_event
 // and android_location_GpsLocationProvider_read_status
 static GpsLocation  sGpsLocationCopy;
 static GpsStatus    sGpsStatusCopy;
 static GpsSvStatus  sGpsSvStatusCopy;
+static GpsSuplStatus    sGpsSuplStatusCopy;
 
 enum CallbackType {
     kLocation = 1,
     kStatus = 2,
     kSvStatus = 4,
-    kXtraDownloadRequest = 8,
-    kDisableRequest = 16,
+    kSuplStatus = 8,
+    kXtraDownloadRequest = 16,
+    kDisableRequest = 32,
 }; 
 static int sPendingCallbacks;
 
@@ -92,6 +96,17 @@ static void sv_status_callback(GpsSvStatus* sv_status)
     pthread_mutex_unlock(&sEventMutex);
 }
 
+static void supl_status_callback(GpsSuplStatus* supl_status)
+{
+    pthread_mutex_lock(&sEventMutex);
+
+    sPendingCallbacks |= kSuplStatus;
+    memcpy(&sGpsSuplStatus, supl_status, sizeof(GpsSuplStatus));
+
+    pthread_cond_signal(&sEventCond);
+    pthread_mutex_unlock(&sEventMutex);
+}
+
 GpsCallbacks sGpsCallbacks = {
     location_callback,
     status_callback,
@@ -111,11 +126,15 @@ GpsXtraCallbacks sGpsXtraCallbacks = {
     download_request_callback,
 };
 
+GpsSuplCallbacks sGpsSuplCallbacks = {
+    supl_status_callback,
+};
 
 static void android_location_GpsLocationProvider_class_init_native(JNIEnv* env, jclass clazz) {
     method_reportLocation = env->GetMethodID(clazz, "reportLocation", "(IDDDFFFJ)V");
     method_reportStatus = env->GetMethodID(clazz, "reportStatus", "(I)V");
     method_reportSvStatus = env->GetMethodID(clazz, "reportSvStatus", "()V");
+    method_reportSuplStatus = env->GetMethodID(clazz, "reportSuplStatus", "(I)V");
     method_xtraDownloadRequest = env->GetMethodID(clazz, "xtraDownloadRequest", "()V");
 }
 
@@ -129,7 +148,13 @@ static jboolean android_location_GpsLocationProvider_init(JNIEnv* env, jobject o
 {
     if (!sGpsInterface)
         sGpsInterface = gps_get_interface();
-    return (sGpsInterface && sGpsInterface->init(&sGpsCallbacks) == 0);
+    if (!sGpsInterface || sGpsInterface->init(&sGpsCallbacks) != 0)
+        return false;
+
+    if (!sGpsSuplInterface)
+        sGpsSuplInterface = (const GpsSuplInterface*)sGpsInterface->get_extension(GPS_SUPL_INTERFACE);
+    if (sGpsSuplInterface)
+        sGpsSuplInterface->init(&sGpsSuplCallbacks);
 }
 
 static void android_location_GpsLocationProvider_disable(JNIEnv* env, jobject obj)
@@ -186,6 +211,7 @@ static void android_location_GpsLocationProvider_wait_for_event(JNIEnv* env, job
     memcpy(&sGpsLocationCopy, &sGpsLocation, sizeof(sGpsLocationCopy));
     memcpy(&sGpsStatusCopy, &sGpsStatus, sizeof(sGpsStatusCopy));
     memcpy(&sGpsSvStatusCopy, &sGpsSvStatus, sizeof(sGpsSvStatusCopy));
+    memcpy(&sGpsSuplStatusCopy, &sGpsSuplStatus, sizeof(sGpsSuplStatusCopy));
     pthread_mutex_unlock(&sEventMutex);   
 
     if (pendingCallbacks & kLocation) { 
@@ -201,6 +227,9 @@ static void android_location_GpsLocationProvider_wait_for_event(JNIEnv* env, job
     if (pendingCallbacks & kSvStatus) {
         env->CallVoidMethod(obj, method_reportSvStatus);
     }
+    if (pendingCallbacks & kSuplStatus) {
+        env->CallVoidMethod(obj, method_reportSuplStatus, sGpsSuplStatusCopy.status);
+    }  
     if (pendingCallbacks & kXtraDownloadRequest) {    
         env->CallVoidMethod(obj, method_xtraDownloadRequest);
     }
@@ -269,30 +298,50 @@ static void android_location_GpsLocationProvider_inject_xtra_data(JNIEnv* env, j
     env->ReleaseByteArrayElements(data, bytes, 0);
 }
 
-static void android_location_GpsLocationProvider_set_supl_server(JNIEnv* env, jobject obj,
-        jint addr, jint port)
+static void android_location_GpsLocationProvider_supl_data_conn_open(JNIEnv* env, jobject obj, jstring apn)
 {
     if (!sGpsSuplInterface) {
         sGpsSuplInterface = (const GpsSuplInterface*)sGpsInterface->get_extension(GPS_SUPL_INTERFACE);
     }
     if (sGpsSuplInterface) {
-        sGpsSuplInterface->set_server(addr, port);
+        if (apn == NULL) {
+            jniThrowException(env, "java/lang/IllegalArgumentException", NULL);
+            return;
+        }
+        const char *apnStr = env->GetStringUTFChars(apn, NULL);
+        sGpsSuplInterface->data_conn_open(apnStr);
+        env->ReleaseStringUTFChars(apn, apnStr);
     }
 }
 
-static void android_location_GpsLocationProvider_set_supl_apn(JNIEnv* env, jobject obj, jstring apn)
+static void android_location_GpsLocationProvider_supl_data_conn_closed(JNIEnv* env, jobject obj)
 {
     if (!sGpsSuplInterface) {
         sGpsSuplInterface = (const GpsSuplInterface*)sGpsInterface->get_extension(GPS_SUPL_INTERFACE);
     }
     if (sGpsSuplInterface) {
-        if (apn == NULL) {
-            jniThrowException(env, "java/lang/IllegalArgumentException", NULL);
-            return;
-        }
-        const char *apnStr = env->GetStringUTFChars(apn, NULL);
-        sGpsSuplInterface->set_apn(apnStr);
-        env->ReleaseStringUTFChars(apn, apnStr);
+        sGpsSuplInterface->data_conn_closed();
+    }
+}
+
+static void android_location_GpsLocationProvider_supl_data_conn_failed(JNIEnv* env, jobject obj)
+{
+    if (!sGpsSuplInterface) {
+        sGpsSuplInterface = (const GpsSuplInterface*)sGpsInterface->get_extension(GPS_SUPL_INTERFACE);
+    }
+    if (sGpsSuplInterface) {
+        sGpsSuplInterface->data_conn_failed();
+    }
+}
+
+static void android_location_GpsLocationProvider_set_supl_server(JNIEnv* env, jobject obj,
+        jint addr, jint port)
+{
+    if (!sGpsSuplInterface) {
+        sGpsSuplInterface = (const GpsSuplInterface*)sGpsInterface->get_extension(GPS_SUPL_INTERFACE);
+    }
+    if (sGpsSuplInterface) {
+        sGpsSuplInterface->set_server(addr, port);
     }
 }
 
@@ -312,8 +361,10 @@ static JNINativeMethod sMethods[] = {
 	{"native_inject_time", "(JJI)V", (void*)android_location_GpsLocationProvider_inject_time},
 	{"native_supports_xtra", "()Z", (void*)android_location_GpsLocationProvider_supports_xtra},
 	{"native_inject_xtra_data", "([BI)V", (void*)android_location_GpsLocationProvider_inject_xtra_data},
+ 	{"native_supl_data_conn_open", "(Ljava/lang/String;)V", (void*)android_location_GpsLocationProvider_supl_data_conn_open},
+ 	{"native_supl_data_conn_closed", "()V", (void*)android_location_GpsLocationProvider_supl_data_conn_closed},
+ 	{"native_supl_data_conn_failed", "()V", (void*)android_location_GpsLocationProvider_supl_data_conn_failed},
  	{"native_set_supl_server", "(II)V", (void*)android_location_GpsLocationProvider_set_supl_server},
- 	{"native_set_supl_apn", "(Ljava/lang/String;)V", (void*)android_location_GpsLocationProvider_set_supl_apn},
 };
 
 int register_android_location_GpsLocationProvider(JNIEnv* env)
diff --git a/core/jni/android_util_Process.cpp b/core/jni/android_util_Process.cpp
index 3feccde03c31..bd5660550d41 100644
--- a/core/jni/android_util_Process.cpp
+++ b/core/jni/android_util_Process.cpp
@@ -516,39 +516,10 @@ enum {
     PROC_OUT_FLOAT = 0x4000,
 };
 
-jboolean android_os_Process_readProcFile(JNIEnv* env, jobject clazz,
-        jstring file, jintArray format, jobjectArray outStrings,
-        jlongArray outLongs, jfloatArray outFloats)
+jboolean android_os_Process_parseProcLineArray(JNIEnv* env, jobject clazz,
+        char* buffer, jint startIndex, jint endIndex, jintArray format, 
+        jobjectArray outStrings, jlongArray outLongs, jfloatArray outFloats)
 {
-    if (file == NULL || format == NULL) {
-        jniThrowException(env, "java/lang/NullPointerException", NULL);
-        return JNI_FALSE;
-    }
-    
-    const char* file8 = env->GetStringUTFChars(file, NULL);
-    if (file8 == NULL) {
-        jniThrowException(env, "java/lang/OutOfMemoryError", NULL);
-        return JNI_FALSE;
-    }
-    int fd = open(file8, O_RDONLY);
-    env->ReleaseStringUTFChars(file, file8);
-    
-    if (fd < 0) {
-        //LOGW("Unable to open process file: %s\n", file8);
-        return JNI_FALSE;
-    }
-    
-    char buffer[256];
-    const int len = read(fd, buffer, sizeof(buffer)-1);
-    close(fd);
-    
-    if (len < 0) {
-        //LOGW("Unable to open process file: %s fd=%d\n", file8, fd);
-        return JNI_FALSE;
-    }
-    buffer[len] = 0;
-    
-    //LOGI("Process file %s: %s\n", file8, buffer);
     
     const jsize NF = env->GetArrayLength(format);
     const jsize NS = outStrings ? env->GetArrayLength(outStrings) : 0;
@@ -575,7 +546,7 @@ jboolean android_os_Process_readProcFile(JNIEnv* env, jobject clazz,
         return JNI_FALSE;
     }
 
-    jsize i = 0;
+    jsize i = startIndex;
     jsize di = 0;
     
     jboolean res = JNI_TRUE;
@@ -587,30 +558,30 @@ jboolean android_os_Process_readProcFile(JNIEnv* env, jobject clazz,
         }
         const char term = (char)(mode&PROC_TERM_MASK);
         const jsize start = i;
-        if (i >= len) {
+        if (i >= endIndex) {
             res = JNI_FALSE;
             break;
         }
         
         jsize end = -1;
         if ((mode&PROC_PARENS) != 0) {
-            while (buffer[i] != ')' && i < len) {
+            while (buffer[i] != ')' && i < endIndex) {
                 i++;
             }
             end = i;
             i++;
         }
-        while (buffer[i] != term && i < len) {
+        while (buffer[i] != term && i < endIndex) {
             i++;
         }
         if (end < 0) {
             end = i;
         }
         
-        if (i < len) {
+        if (i < endIndex) {
             i++;
             if ((mode&PROC_COMBINE) != 0) {
-                while (buffer[i] == term && i < len) {
+                while (buffer[i] == term && i < endIndex) {
                     i++;
                 }
             }
@@ -649,6 +620,58 @@ jboolean android_os_Process_readProcFile(JNIEnv* env, jobject clazz,
     return res;
 }
 
+jboolean android_os_Process_parseProcLine(JNIEnv* env, jobject clazz,
+        jbyteArray buffer, jint startIndex, jint endIndex, jintArray format, 
+        jobjectArray outStrings, jlongArray outLongs, jfloatArray outFloats)
+{
+        jbyte* bufferArray = env->GetByteArrayElements(buffer, NULL);
+
+        jboolean result = android_os_Process_parseProcLineArray(env, clazz, 
+                (char*) bufferArray, startIndex, endIndex, format, outStrings, 
+                outLongs, outFloats);
+                
+        env->ReleaseByteArrayElements(buffer, bufferArray, 0);
+        
+        return result;
+}
+
+jboolean android_os_Process_readProcFile(JNIEnv* env, jobject clazz,
+        jstring file, jintArray format, jobjectArray outStrings,
+        jlongArray outLongs, jfloatArray outFloats)
+{
+    if (file == NULL || format == NULL) {
+        jniThrowException(env, "java/lang/NullPointerException", NULL);
+        return JNI_FALSE;
+    }
+
+    const char* file8 = env->GetStringUTFChars(file, NULL);
+    if (file8 == NULL) {
+        jniThrowException(env, "java/lang/OutOfMemoryError", NULL);
+        return JNI_FALSE;
+    }
+    int fd = open(file8, O_RDONLY);
+    env->ReleaseStringUTFChars(file, file8);
+    
+    if (fd < 0) {
+        //LOGW("Unable to open process file: %s\n", file8);
+        return JNI_FALSE;
+    }
+    
+    char buffer[256];
+    const int len = read(fd, buffer, sizeof(buffer)-1);
+    close(fd);
+    
+    if (len < 0) {
+        //LOGW("Unable to open process file: %s fd=%d\n", file8, fd);
+        return JNI_FALSE;
+    }
+    buffer[len] = 0;
+    
+    return android_os_Process_parseProcLineArray(env, clazz, buffer, 0, len, 
+            format, outStrings, outLongs, outFloats);
+    
+}
+
 void android_os_Process_setApplicationObject(JNIEnv* env, jobject clazz,
                                              jobject binderObject)
 {
@@ -728,6 +751,7 @@ static const JNINativeMethod methods[] = {
     {"readProcLines", "(Ljava/lang/String;[Ljava/lang/String;[J)V", (void*)android_os_Process_readProcLines},
     {"getPids", "(Ljava/lang/String;[I)[I", (void*)android_os_Process_getPids},
     {"readProcFile", "(Ljava/lang/String;[I[Ljava/lang/String;[J[F)Z", (void*)android_os_Process_readProcFile},
+    {"parseProcLine", "([BII[I[Ljava/lang/String;[J[F)Z", (void*)android_os_Process_parseProcLine},
     {"getElapsedCpuTime", "()J", (void*)android_os_Process_getElapsedCpuTime},
     {"getPss", "(I)J", (void*)android_os_Process_getPss},
     //{"setApplicationObject", "(Landroid/os/IBinder;)V", (void*)android_os_Process_setApplicationObject},
@@ -746,4 +770,3 @@ int register_android_os_Process(JNIEnv* env)
         env, kProcessPathName,
         methods, NELEM(methods));
 }
-
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index e1a536c3e85c..c653c7841276 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -983,6 +983,11 @@
                 android:excludeFromRecents="true">
         </activity>
 
+        <activity android:name="android.accounts.ChooseAccountActivity"
+                android:excludeFromRecents="true"
+                android:exported="true">
+        </activity>
+
         <provider android:name=".content.SyncProvider"
                 android:authorities="sync" android:multiprocess="false" />
 
diff --git a/core/res/res/values-en-rIE/arrays.xml b/core/res/res/values-en-rIE/arrays.xml
new file mode 100644
index 000000000000..51cc537de006
--- /dev/null
+++ b/core/res/res/values-en-rIE/arrays.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* 
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>53366667</item>
+        <item>-8000000</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>7</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-en-rZA/arrays.xml b/core/res/res/values-en-rZA/arrays.xml
new file mode 100644
index 000000000000..259b2b15af5d
--- /dev/null
+++ b/core/res/res/values-en-rZA/arrays.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>-26183333</item>
+        <item>28050000</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>5</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml
index edf7d2621202..8dbe7a8e1976 100644
--- a/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@ -2720,12 +2720,13 @@
           <flag name="showVoiceSearchButton" value="0x01" />
           <!-- If set, the voice search button will take the user directly to a built-in
                voice web search activity.  Most applications will not use this flag, as it
-               will take the user away from your searchable activity. -->
+               will take the user away from the activity in which search was invoked. -->
           <flag name="launchWebSearch" value="0x02" />
           <!-- If set, the voice search button will take the user directly to a built-in
                voice recording activity.  This activity will prompt the user to speak,
-               transcribe the spoke text, and forward the resulting query text to your
-               searchable activity, just as if the user had typed it into the search UI. -->
+               transcribe the spoken text, and forward the resulting query
+               text to the searchable activity, just as if the user had typed it into
+               the search UI and clicked the search button. -->
           <flag name="launchRecognizer" value="0x04" />
         </attr>
 
diff --git a/docs/html/community/index.jd b/docs/html/community/index.jd
index 2df4c01d946b..ad3a199aa998 100644
--- a/docs/html/community/index.jd
+++ b/docs/html/community/index.jd
@@ -77,7 +77,7 @@ phrasing your questions, read <a href="http://www.catb.org/%7Eesr/faqs/smart-que
 <li><b>Android security discuss</b> - A place for open discussion on secure development, emerging security concerns, and best practices for and by android developers. Please don't disclose vulnerabilities directly on this list, you'd be putting all Android users at risk.
 <ul>
 <li>Subscribe using Google Groups:&nbsp;<a href="http://groups.google.com/group/android-security-discuss">android-security-discuss</a></li>
-<li>Subscribe via email:&nbsp;<a href="mailto:android-security-discuss@googlegroups.com">android-secuirty-discuss@googlegroups.com</a><a href="mailto:android-platform-subscribe@googlegroups.com">
+<li>Subscribe via email:&nbsp;<a href="mailto:android-security-discuss@googlegroups.com">android-security-discuss@googlegroups.com</a><a href="mailto:android-platform-subscribe@googlegroups.com">
     </a></li>
 </ul>
 </li>
diff --git a/docs/html/guide/appendix/faq/commontasks.jd b/docs/html/guide/appendix/faq/commontasks.jd
index 9c79bddf75ea..0f89e7534a68 100644
--- a/docs/html/guide/appendix/faq/commontasks.jd
+++ b/docs/html/guide/appendix/faq/commontasks.jd
@@ -701,8 +701,8 @@ If the latitudeSpan, longitudeSpan, and zoomLevel attributes are not consistent,
 
 <a name="filelist" id="filelist"></a><h2>List of Files for an Android Application</h2>
 <p>The following list describes the structure and files of an Android application.
-    Many of these files can be built for you (or stubbed out) by the activitycreator
-    application shipped in the tools/ menu of the SDK. </p>
+    Many of these files can be built for you (or stubbed out) by the android tool
+    shipped in the tools/ menu of the SDK. </p>
 <table width="100%" border="0">
     <tr>
         <td width="28%" valign="top">MyApp/<br /></td>
diff --git a/docs/html/guide/appendix/faq/framework.jd b/docs/html/guide/appendix/faq/framework.jd
index 76a19c56d19d..33b69acf2150 100644
--- a/docs/html/guide/appendix/faq/framework.jd
+++ b/docs/html/guide/appendix/faq/framework.jd
@@ -12,7 +12,7 @@ parent.link=index.html
   from one Activity/Service to another?</a></li>
   <li><a href="#4">How can I check if an Activity is already
   running before starting it?</a></li>
-  <li><a href="#5">If an Activity starts a remote service,is
+  <li><a href="#5">If an Activity starts a remote service, is
   there any way for the Service to pass a message back to the Activity?</a></li>
   <li><a href="#6">How to avoid getting the Application not
   responding dialog?</a></li>
@@ -20,7 +20,6 @@ parent.link=index.html
   added or removed?</a></li>
 </ul>
 
-<!-- ------------------------------------------------------------------ -->
 
 <a name="1" id="1"></a>
 
@@ -32,7 +31,7 @@ default. If needed, you can declare an <code>android:process</code> attribute
 in your manifest file, to explicitly place a component (Activity/Service) in
 another process.</p>
 
-<!-- ------------------------------------------------------------------ -->
+
 
 <a name="2" id="2"></a>
 
@@ -47,7 +46,7 @@ separate pool of transaction threads in each process to dispatch all
 incoming IPC calls. The developer should create separate threads for any
 long-running code, to avoid blocking the main UI thread.</p>
 
-<!-- ------------------------------------------------------------------ -->
+
 
 <a name="3" id="3"></a>
 
@@ -128,7 +127,7 @@ the <a href="{@docRoot}guide/topics/data/data-storage.html">Data Storage</a>
 for further details on how to use these components.</p>
 
 
-<!-- ------------------------------------------------------------------ -->
+
 
 <a name="4" id="4"></a>
 
@@ -140,7 +139,7 @@ or to bring the activity stack to the front if is already running in the
 background&mdash; is the to use the NEW_TASK_LAUNCH flag in the startActivity()
 call.</p>
 
-<!-- ------------------------------------------------------------------ -->
+
 
 <a name="5" id="5"></a>
 
@@ -156,7 +155,7 @@ messages.</p>
 <p>The sample code for remote service callbacks is given in <a
 href="{@docRoot}guide/samples/ApiDemos/src/com/example/android/apis/app/RemoteService.html">ApiDemos/RemoteService</a></p>
 
-<!-- ------------------------------------------------------------------ -->
+
 
 <a name="6" id="6"></a>
 
@@ -166,7 +165,7 @@ href="{@docRoot}guide/samples/ApiDemos/src/com/example/android/apis/app/RemoteSe
 document.</p>
 
 
-<!-- ------------------------------------------------------------------ -->
+
 
 <a name="7" id="7"></a>
 
@@ -194,5 +193,5 @@ removed.
 
 </p>
 
-<!-- ------------------------------------------------------------------ -->
+
 
diff --git a/docs/html/guide/appendix/faq/troubleshooting.jd b/docs/html/guide/appendix/faq/troubleshooting.jd
index 7c703e6d07f3..0cf1ab006d1e 100644
--- a/docs/html/guide/appendix/faq/troubleshooting.jd
+++ b/docs/html/guide/appendix/faq/troubleshooting.jd
@@ -23,7 +23,6 @@ parent.link=index.html
     <li><a href="#majorminor">When I go to preferences in Eclipse and select "Android", I get the following error message: Unsupported major.minor version 49.0.</a></li>
     <li><a href="#apidemosreinstall">I can't install ApiDemos apps in my IDE because of a signing error</a></li>
     <li><a href="#signingcalendar">I can't compile my app because the build tools generated an expired debug certificate</a></li>
-    <li><a href="#addjunit">I can't run a JUnit test class in Eclipse/ADT</a></li>
 </ul>
 
 <a name="installeclipsecomponents" id="installeclipsecomponents"></a><h2>ADT Installation Error: "requires plug-in org.eclipse.wst.sse.ui".</h2>
@@ -245,8 +244,8 @@ documentation.</p>
 
 <ol>
 <li>First, delete the debug keystore/key already generated by the Android build tools. Specifically, delete the <code>debug.keystore</code> file. On Linux/Mac OSX, the file is stored in <code>~/.android</code>. On Windows XP, the file is stored in <code>
-C:\Documents and Settings\&lt;user&gt;\Local Settings\Application Data\Android</code>. On Windows Vista, the file is stored in <code>
-C:\Users\&lt;user&gt;\AppData\Local\Android</code></li>
+C:\Documents and Settings\&lt;user&gt;\.android</code>. On Windows Vista, the file is stored in <code>
+C:\Users\&lt;user&gt;\.android</code></li>
 <li>Next, you can either
 <ul>
 <li>Temporarily change your development machine's locale (date and time) to one that uses a Gregorian calendar, for example, United States. Once the locale is changed, use the Android build tools to compile and install your app. The build tools will regenerate a new keystore and debug key with valid dates. Once the new debug key is generated, you can reset your development machine to the original locale. </li>
@@ -260,46 +259,3 @@ C:\Users\&lt;user&gt;\AppData\Local\Android</code></li>
 <p>For general information about signing Android applications, see 
 <a href="{@docRoot}guide/publishing/app-signing.html">Signing Your Applications</a>. </p>
 
-<h2 id="addjunit">I can't run a JUnit test class in Eclipse/ADT</h2>
-
-<p>If you are developing on Eclipse/ADT, you can add JUnit test classes to your application. However, you may get an error when trying to run such a class as a JUnit test:</p>
-
-<pre>Error occurred during initialization of VM
-java/lang/NoClassDefFoundError: java/lang/ref/FinalReference</pre>
-
-<p>This error occurs because android.jar does not include complete Junit.* class implementations, but includes stub classes only. </p>
-
-<p>To add a JUnit class, you have to set up a JUnit configuration:. 
-
-<ol>
-<li>In the Package Explorer view, select your project. </li>
-<li>Open the launch configuration manager.
-         <ul>
-            <li>In Eclipse 3.3 (Europa), select <strong>Run </strong>&gt; 
-              <strong>Open Run Dialog... </strong>or <strong>Run </strong>&gt; 
-              <strong>Open Debug Dialog... </strong>.
-            </li>
-
-            <li>In Eclipse 3.4 (Ganymede), select <strong>Run </strong>&gt; 
-              <strong>Run Configurations... </strong>or <strong>Run </strong>&gt; 
-              <strong>Debug Configurations... </strong>.
-            </li>
-        </ul>
-    </li>
-<li>In the configuration manager, right-click the "JUnit" configuration type and select <strong>New</strong></li>
-<li>In the new configuration's <strong>Test</strong> tab, specify the project and test class, as well as any options for running the test. </li>
-<li>In the new configuration's <strong>Classpath</strong> tab, find "Android Library" under Bootstrap Entries and remove it.  </li>
-<li>Still in the <strong>Classpath</strong> tab, select Bootstrap Entries and click the Advanced button. </li>
-<ol type="a">
-<li>Choose Add Library and click OK.</li>
-<li>Select JRE System Library and click Next. </li>
-<li>Select Workspace Default JRE and click Finish.</li>
-</ol>
-<li>Select Bootstrap Entries again and click Advanced.</li>
-<ol type="a">
-<li>Choose Add Library and click OK.</li>
-<li>Select JUnit 3 and click Finish. </li>
-</ol>
-</ol>
-<p>When configured in this way, your JUnit test class should now run properly.</p>
-
diff --git a/docs/html/guide/appendix/media-formats.jd b/docs/html/guide/appendix/media-formats.jd
index 5419ad679297..a3cc0ff09692 100644
--- a/docs/html/guide/appendix/media-formats.jd
+++ b/docs/html/guide/appendix/media-formats.jd
@@ -1,8 +1,8 @@
 page.title=Android Supported Media Formats
 @jd:body
 
-<p>The <a href="#core">Core Media Formats</a> table below describes the media format support built into the Android platform. Note that any given mobile device may provide support for additional formats or file types not listed here. </p>
-<p>For your convenience, the table <a href="#g1">T-Mobile G1 Media Formats</a> describes the additional media formats supported by the T-Mobile G1 device. </p>
+<p>The <a href="#core">Core Media Formats</a> table below describes the media format support built into the Android platform. Note that any given mobile device may provide support for additional formats or file types not listed in the table. </p>
+<p>For your convenience, the table <a href="#g1">T-Mobile G1 Media Formats</a> describes additional media format details for the T-Mobile G1 device. </p>
 
 
 <h2 id="core">Core Media Formats</h2>
@@ -95,7 +95,7 @@ page.title=Android Supported Media Formats
 <td>JPEG</td>
 <td style="text-align: center;">X</td>
 <td style="text-align: center;">X</td>
-<td>base+progressive</td>
+<td>Base+progressive</td>
 <td>JPEG (.jpg)</td>
 </tr>
 
@@ -134,17 +134,17 @@ page.title=Android Supported Media Formats
 </tr>
 
 <tr>
-<td>H.264</td>
-<td style="text-align: center;">X</td>
+<td>H.264 AVC</td>
+<td style="text-align: center;"></td>
 <td style="text-align: center;">X</td>
 <td>&nbsp;</td>
 <td>3GPP (.3gp) and MPEG-4 (.mp4)</td>
 </tr>
 
 <tr>
-<td>MPEG4 SP</td>
-<td>&nbsp;</td>
+<td>MPEG-4 SP</td>
 <td>&nbsp;</td>
+<td style="text-align: center;">X</td>
 <td>&nbsp;</td>
 <td>3GPP (.3gp)</td>
 </tr>
@@ -171,7 +171,7 @@ page.title=Android Supported Media Formats
 <td>Audio</td>
 <td>WMA</td>
 <td>&nbsp;</td>
-<td>X</td>
+<td style="text-align: center;">X</td>
 <td>Supports WMA standard L1-L3:
 <ul>
 <li>L1: 64 kbps - 161 kbps @ 44.1kHz</li>
@@ -184,13 +184,30 @@ Mono and stereo profiles with 16-bits per sample. Decoder does not support WMA P
 </tr>
 
 <tr>
-<td>Video</td>
+<td rowspan="3">Video</td>
 <td>WMV</td>
 <td>&nbsp;</td>
-<td>X</td>
+<td style="text-align: center;">X</td>
 <td>Versions 7, 8 and 9. Simple profile only</td>
 <td>Windows Media Video (.wmv)</td>
 </tr>
+
+<tr>
+<td>H.263</td>
+<td style="text-align: center;">X</td>
+<td style="text-align: center;">X</td>
+<td>&nbsp;</td>
+<td>3GPP (.3gp) and MPEG-4 (.mp4)</td>
+</tr>
+
+<tr>
+<td>H.264&nbsp;AVC</td>
+<td>&nbsp;</td>
+<td style="text-align: center;">X</td>
+<td>Limited to baseline profile up to 480x320, and 600 kbps average bitrate for the video stream.</td>
+<td>3GPP (.3gp) and MPEG-4 (.mp4)</td>
+</tr>
+
 </tbody></table>
 
 
diff --git a/docs/html/guide/developing/app-signing.jd b/docs/html/guide/developing/app-signing.jd
deleted file mode 100644
index 582dfb267b6f..000000000000
--- a/docs/html/guide/developing/app-signing.jd
+++ /dev/null
@@ -1,428 +0,0 @@
-page.title=Signing Your Applications
-@jd:body
-
-<p>The Android system requires that all installed applications be digitally
-signed with a certificate whose private key is held by the application's
-developer. The system uses the certificate as a means of identifying the author of
-an application and establishing trust relationships between applications, rather
-than for controlling which applications the user can install. The certificate
-does not need to be signed by a certificate authority: it is perfectly
-allowable, and typical, for Android applications to use self-signed
-certificates.</p>
-
-<p>The important points to understand about signing Android applications are:</p>
-
-<ul>
-  <li>All applications <em>must</em> be signed. The system will not install an application 
-that is not signed.</li>
-  <li>You can use self-signed certificates to sign your applications. No certificate authority 
-is needed.</li>
-  <li>When you are ready to publish your application, you must sign it with a suitable private 
-key. You can not publish an application that is signed with the default key generated 
-by the SDK tools. 
-  </li>
-  <li>The system tests a signer certificate's expiration date only at install time. If an 
-application's signer certificate expires after the application is installed, the application 
-will continue to function normally.</li>
-  <li>You can use standard tools &mdash; Keytool and Jarsigner &mdash; to generate keys and 
-sign your application .apk files.</li>
-</ul>
-
-<p>The Android system will not install or run an application that is not signed appropriately. This 
-applies wherever the Android system is run, whether on an actual device or on the emulator. 
-For this reason, you must set up signing for your application before you will be able to 
-run or debug it on an emulator or device.</p>
-
-<p>The Android SDK tools assist you in signing your applications when debugging. Both the ADT Plugin 
-for Eclipse and the Ant build tool offer two signing modes &mdash; debug mode and release mode. 
-
-<ul>
-<li>In debug mode, the build tools use the Keytool utility, included in the JDK, to create 
-a keystore and key with a known alias and password. At each compilation, the tools then use 
-the debug key to sign the application .apk file. Because the password is known, the tools 
-don't need to prompt you for the keystore/key password each time you compile.</li>
-
-<li>When your application is ready for release, you compile it in release signing mode. 
-In this mode, the tools compile your .apk <em>without</em> signing it. You must then sign
-the .apk manually &mdash; <span style="color:red">with your private key</span> &mdash; 
-using Jarsigner (or similar tool). If you do not have a suitable private key already, 
-you can run Keytool manually to generate your own keystore/key and then sign your 
-application with Jarsigner.</li>
-</ul>
-
-<h2>Signing Strategies</h2>
-
-<p>Some aspects of application signing may affect how you approach the development
-of your application, especially if you are planning to release multiple
-applications. </p>
-
-<p>In general, the recommended strategy for all developers is to sign
-all of your applications with the same certificate, throughout the expected
-lifespan of your applications. There are several reasons why you should do so: </p>
-
-<ul>
-<li>Application upgrade &mdash; As you release upgrades to your
-application, you will want to sign the upgrades with the same certificate, if you
-want users to upgrade seamlessly to the new version. When the system is 
-installing an update to an application, if any of the certificates in the 
-new version match any of the certificates in the old version, then the 
-system allows the update. If you sign the version without using a matching
-certificate, you will also need to assign a different package name to the 
-application &mdash; in this case, the user installs the new version as a 
-completely new application. 
-
-<li>Application modularity &mdash; The Android system allows applications that
-are signed by the same certificate to run in the same process, if the
-applications so request, so that the system treats them as a single application.
-In this way you can deploy your application in modules, and users can update
-each of the modules independently if needed.</li>
-
-<li>Code/data sharing through permissions &mdash; The Android system provides
-signature-based permissions enforcement, so that an application can expose
-functionality to another application that is signed with a specified
-certificate. By signing multiple applications with the same certificate and
-using signature-based permissions checks, your applications can share code and
-data in a secure manner. </li>
-
-</li>
-
-</ul>
-
-<p>Another important consideration in determining your signing strategy is 
-how to set the validity period of the key that you will use to sign your 
-applications.</p>
-
-<ul>
-<li>If you plan to support upgrades for a single application, you should ensure 
-that your key has a validity period that exceeds the expected lifespan of
-that application. A validity period of 25 years or more is recommended. 
-When your key's validity period expires, users will no longer be
-able to seamlessly upgrade to new versions of your application.</li>
-
-<li>If you will sign multiple distinct applications with the same key, 
-you should ensure that your key's validity period exceeds the expected 
-lifespan of <em>all versions of all of the applications</em>, including 
-dependent applications that may be added to the suite in the future. </li>
-
-<li>If you plan to publish your application(s) on Android Market, the
-key you use to sign the application(s) must have a validity period 
-ending after 22 October 2033. The Market server enforces this requirement
-to ensure that users can seamlessly upgrade Market applications when
-new versions are available. </li>
-</ul>
-
-<p>As you design your application, keep these points in mind and make sure to
-use a <a href="#cert">suitable certificate</a> to sign your applications. </p>
-
-<h2 id="setup">Basic Setup for Signing</h2>
-
-<p>To support the generation of a keystore and debug key, you should first make sure that 
-Keytool is available to the SDK build 
-tools. In most cases, you can tell the SDK build tools how to find Keytool by making sure 
-that your JAVA_HOME environment variable is set and that it references a suitable JDK. 
-Alternatively, you can add the JDK version of Keytool to your PATH variable.</p>
-
-<p>If you are developing on a version of Linux that originally came with GNU Compiler for 
-Java, make sure that the system is using the JDK version of Keytool, rather than the gcj 
-version. If Keytool is already in your PATH, it might be pointing to a symlink at 
-/usr/bin/keytool. In this case, check the symlink target to make sure that it points 
-to the Keytool in the JDK.</p>
-
-<p>If you will release your application to the public, you will also need to have
-the Jarsigner tool available on your machine. Both Jarsigner and Keytool are included
-in the JDK. </p>
-
-<h2>Signing in Debug Mode</h2>
-
-<p>The Android build tools provide a debug signing mode that makes it easier for you 
-to develop and debug your application, while still meeting the Android system
-requirement for signing your .apk when it is installed in the emulator or a device. </p>
-
-<p>If you are developing in Eclipse/ADT and have set up Keytool as described
-above, signing in debug mode is enabled by default. When you run or debug your
-application, ADT signs the .apk for you and installs it on the emulator. No
-specific action on your part is needed, provided ADT has access to Keytool.</p>
-
-<p>If you use Ant to build your .apk files, debug signing mode 
-is enabled by default, assuming that you are using a build.xml file generated by the 
-activitycreator tool included in the latest SDK. When you run Ant against build.xml to 
-compile your app, the build script generates a keystore/key and signs the .apk for you. 
-No specific action on your part is needed.</p>
-
-<p>Note that you can not release your application to the public if it is signed only with
-the debug key. </p>
-
-<h2>Signing for Public Release</h2>
-
-<p>When your application is ready for release to other users, you must:</p>
-<ol>
-<li>Compile the application in release mode</li>
-<li>Obtain a suitable private key, and then</li>
-<li>Sign the application with your private key</li>
-<li>Secure your private key</li>
-</ol>
-
-<p>The sections below provide information about these steps. </p>
-
-<h3>Compiling for Release</h3>
-
-<p>To prepare your application for release, you must first compile it in release mode. 
-In release mode, the Android build tools compile your application as usual, 
-but without signing it with the debug key.  </p>
-
-<p>If you are developing in Eclipse/ADT, right-click the project in the Package 
-pane and select <strong>Android Tools</strong> > <strong>Export Application 
-Package</strong>. You can then specify the file location for the unsigned .apk. 
-Alternatively, you can follow the "Exporting the unsigned .apk" 
-link in the Manifest Editor overview page. </p>
-
-<p>If you are using Ant, all you need to do is specify the build target 
-"release" in the Ant command. For example, if you are running Ant from the 
-directory containing your build.xml file, the command would look like this:</p>
-
-<pre>$ ant release</pre>
-
-<p>The build script compiles the application .apk without signing it. 
-
-<p>Note that you can not release your application unsigned, or signed with the debug key.</p>
-
-<h3 id="cert">Obtaining a Suitable Private Key</h3>
-
-<p>In preparation for signing your application, you must first ensure that 
-you have a suitable private key with which to sign. A suitable private 
-key is one that:</p>
-
-<ul>
-<li>Is in your possession</li>
-<li>Represents the personal, corporate, or organizational entity to be identified 
-with the application</li>
-<li>Has a validity period that exceeds the expected lifespan of the application
-or application suite. A validity period of more than 25 years is recommended. 
-<p>If you plan to publish your application(s) on Android Market, note that a 
-validity period ending after 22 October 2033 is a requirement. You can not upload an
-application if it is signed with a key whose validity expires before that date. 
-</p></li>
-<li>Is not the debug key generated by the Android SDK tools. </li>
-</ul>
-
-<p>The key may be self-signed. If you do not have a suitable key, you must 
-generate one using Keytool. Make sure that you have Keytool available, as described
-in <a href="#setup">Basic Setup</a>.</p>
-
-<p>To generate a self-signed key with Keytool, use the <code>keytool</code>
-command and pass any of the options listed below (and any others, as
-needed). </p>
-
-<p class="warning">Before you run Keytool, make sure to read <a
-href="#secure-key">Securing Your Key</a> for a discussion of how to keep your
-key secure and why doing so is critically important to you and to users. In
-particular, when you are generating your key, you should select strong
-passwords for both the keystore and key.</p>
-
-<table>
-<tr>
-<th>Keytool Option</th>
-<th>Description</th>
-</tr>
-<tr>
-<td><code>-genkey</code></td><td>Generate a key pair (public and private
-keys)</td>
-</tr>
-<tr>
-<td><code>-v</code></td><td>Enable verbose output.</td>
-</tr>
-<tr>
-<td><code>-keystore&nbsp;&lt;keystore-name&gt;.keystore</code></td><td>A name
-for the keystore containing the private key.</td>
-</tr>
-<tr>
-<td><code>-storepass &lt;password&gt;</code></td><td><p>A password for the
-keystore.</p><p>As a security precaution, do not include this option 
-in your command line unless you are working at a secure computer.
-If not supplied, Keytool prompts you to enter the password. In this 
-way, your password is not stored in your shell history.</p></td>
-</tr>
-<tr>
-<td><code>-alias &lt;alias_name&gt;</code></td><td>An alias for the key.</td>
-</tr>
-<tr>
-<td><code>-keyalg &lt;alg&gt;</code></td><td>The encryption algorithm to use 
-when generating the key.</td>
-</tr>
-<tr>
-<td><code>-dname &lt;name&gt;</code></td><td><p>A Distinguished Name that describes
-who created the key. The value is used as the issuer and subject fields in the
-self-signed certificate. </p><p>Note that you do not need to specify this option
-in the command line. If not supplied, Jarsigner prompts you to enter each 
-of the Distinguished Name fields (CN, OU, and so on).</p></td>
-</tr>
-<tr>
-<td><code>-validity &lt;valdays&gt;</code></td><td><p>The validity period for the
-key, in days. </p><p><strong>Note:</strong> A value of 9500 or greater is recommended.</p></td>
-</tr>
-<tr>
-<td><code>-keypass &lt;password&gt;</code></td><td><p>The password for the key.</p>
-<p>As a security precaution, do not include this option 
-in your command line unless you are working at a secure computer.
-If not supplied, Keytool prompts you to enter the password. In this 
-way, your password is not stored in your shell history.</p></td>
-</tr>
-</table>
-
-
-<p>Here's an example of a Keytool command that generates a private key:</p>
-
-<pre>$ keytool -genkey -v -keystore my-release-key.keystore 
--alias alias_name -keyalg RSA -validity 9500</pre>
-
-<p>Running the example command above, Keytool prompts you to provide
-passwords for the keystore and key, and to provide the Distinguished
-Name fields for your key. It then generates the keystore as a file called
-<code>my-release-key.keystore</code>. The keystore and key are 
-protected by the passwords you entered. The keystore contains 
-a single key, valid for 9500 days. The alias is a name that you &mdash;
-will use later, to refer to this keystore when signing your application. </p>
-
-<p>For more information about Keytool, see the documentation at
-<a
-href="http://java.sun.com/j2se/1.5.0/docs/tooldocs/#security">
-http://java.sun.com/j2se/1.5.0/docs/tooldocs/#security</a></p>
-
-<h3>Signing Your Application</h3>
-
-<p>When you are ready to actually sign your .apk for release, you can do so
-using the Jarsigner tool. Make sure that you have Jarsigner available on your
-machine, as described in <a href="#setup">Basic Setup</a>. Also, make sure that
-the keystore containing your private key is  available.</p>
-
-<p>To sign your application, you run Jarsigner, referencing both the
-application's .apk and the keystore containing the private key with which to
-sign the .apk. The table below shows the options you could use. <p>
-
-<table>
-<tr>
-<th>Jarsigner Option</th>
-<th>Description</th>
-</tr>
-<tr>
-<td><code>-keystore&nbsp;&lt;keystore-name&gt;.keystore</code></td><td>The name of
-the keystore containing your private key.</td>
-</tr>
-<tr>
-<td><code>-verbose</code></td><td>Enable verbose output.</td>
-</tr>
-<tr>
-<td><code>-storepass &lt;password&gt;</code></td><td><p>The password for the
-keystore. </p><p>As a security precaution, do not include this option 
-in your command line unless you are working at a secure computer.
-If not supplied, Jarsigner prompts you to enter the password. In this 
-way, your password is not stored in your shell history.</p></td>
-</tr>
-<tr>
-<td><code>-keypass &lt;password&gt;</code></td><td><p>The password for the private
-key. </p><p>As a security precaution, do not include this option 
-in your command line unless you are working at a secure computer.
-If not supplied, Jarsigner prompts you to enter the password. In this 
-way, your password is not stored in your shell history.</p></td>
-</tr>
-</table>
-
-<p>Here's how you would use Jarsigner to sign an application package called
-<code>my_application.apk</code>, using the example keystore created above. 
-</p>
-
-<pre>$ jarsigner -verbose -keystore my-release-key.keystore 
-my_application.apk alias_name</pre>
-
-<p>Running the example command above, Jarsigner prompts you to provide
-passwords for the keystore and key. It then modifies the APK 
-in-place, meaning the .apk is now signed. Note that you can sign an 
-APK multiple times with different keys.</p>
-
-<p>To verify that your .apk is signed, you can use a command like this:</p>
-
-<pre>$ jarsigner -verify my_signed.apk</pre>
-
-<p>If the .apk is signed properly, Jarsigner prints "jar verified". 
-If you want more details, you can try one of these commands:</p>
-
-<pre>$ jarsigner -verify -verbose my_application.apk</pre>
-
-<p>or</p>
-
-<pre>$ jarsigner -verify -verbose -certs my_application.apk</pre>
-
-<p>The command above, with the <code>-certs</code> option added, will show you the 
-"CN=" line that describes who created the key.</p>
-
-<p class="note">Note: if you see "CN=Android Debug", this means the .apk was
-signed with the debug key generated by the Android SDK. If you intend to release
-your application, you must sign it with your private key instead of the debug
-key.</p>
-
-<p>For more information about Jarsigner, see the documentation at
-<a href="http://java.sun.com/j2se/1.5.0/docs/tooldocs/#security">
-http://java.sun.com/j2se/1.5.0/docs/tooldocs/#security</a></p>
-
-<h3 id="secure-key">Securing Your Private Key</h3>
-
-<p>Maintaining the security of your private key is of critical importance, both
-to you and to the user. If you allow someone to use your key, or if you leave
-your keystore and passwords in an unsecured location such that a third-party
-could find and use them, your authoring identity and the trust of the user
-are compromised. </p>
-
-<p>If a third party should manage to take your key without your knowledge or 
-permission, that person could sign and distribute applications that maliciously
-replace your authentic applications or corrupt them. Such a person could also
-sign and distribute applications under your identity that attack other 
-applications or the system itself, or corrupt or steal user data. </p>
-
-<p>Your reputation as a developer entity depends on your securing your private
-key properly, at all times, until the key is expired. Here are some tips for
-keeping your key secure: </p>
-
-<ul>
-<li>Select strong passwords for the keystore and key.</li>
-<li>When you generate your key with Keytool, <em>do not</em> supply the 
-<code>-storepass</code> and <code>-keypass</code> options at the command line. 
-If you do so, your passwords will be available in your shell history, 
-which any user on your computer could access.</li>
-<li>Similarly, when signing your applications with Jarsigner, 
-<em>do not</em> supply the <code>-storepass</code> and <code>-keypass</code> 
-options at the command line. </li>
-<li>Do not give or lend anyone your private key, and do not let unauthorized
-persons know your keystore and key passwords.</li>
-</ul>
-
-<p>In general, if you follow common-sense precautions when generating, using,
-and storing your key, it will remain secure. </p>
-
-<h2>Expiry of the Debug Certificate</h2>
-
-<p>The self-signed certificate used to sign your application in debug mode (the default on 
-Eclipse/ADT and Ant builds) will have an expiration date of 365 days from its creation date.</p>
-
-<p>When the certificate expires, you will get a build error. On Ant builds, the error 
-looks like this:</p>
-
-<pre>debug:
-[echo] Packaging bin/samples-debug.apk, and signing it with a debug key...
-[exec] Debug Certificate expired on 8/4/08 3:43 PM</pre>
-
-<p>In Eclipse/ADT, you will see a similar error in the Android console.</p>
-
-<p>To fix this problem, simply delete the <code>debug.keystore</code> file. On Linux/Mac OSX, 
-the file is stored in <code>~/.android</code>. OOn Windows XP, the file is stored in <code>
-C:\Documents and Settings\&lt;user&gt;\Local Settings\Application Data\Android</code>. 
-On Windows Vista, the file is stored in <code>
-C:\Users\&lt;user&gt;\AppData\Local\Android</code>.</p>
-
-<p>The next time you build, the build tools will regenerate a new keystore and debug key.</p>
-
-<p>Note that, if your development machine is using a non-Gregorian locale, the build 
-tools may erroneously generate an already-expired debug certificate, so that you get an 
-error when trying to compile your application. For workaround information, see the 
-troubleshooting topic <a href="{@docRoot}kb/troubleshooting.html#signingcalendar">
-I&nbsp;can't&nbsp;compile my app because the build tools generated an expired debug 
-certificate</a>. </p>
\ No newline at end of file
diff --git a/docs/html/guide/developing/eclipse-adt.jd b/docs/html/guide/developing/eclipse-adt.jd
index 8c482ee40ce5..4f332b13e8cb 100644
--- a/docs/html/guide/developing/eclipse-adt.jd
+++ b/docs/html/guide/developing/eclipse-adt.jd
@@ -1,193 +1,393 @@
-page.title=In Eclipse, with ADT
+page.title=Developing In Eclipse, with ADT
 @jd:body
 
-<p>The Android Development Tools (ADT) plugin for Eclipse adds powerful extensions to the Eclipse integrated development environment. It allows you to create and debug Android applications easier and faster. If you use Eclipse, the ADT plugin gives you an incredible boost in developing Android applications:</p>
+<div id="qv-wrapper">
+  <div id="qv">
+  <h2>In this document</h2>
+  <ol>
+    <li><a href="#CreatingAProject">Creating an Android Project</a></li>
+    <li><a href="#Running">Running Your Application</a>
+      <ol>
+        <li><a href="#CreatingAnAvd">Creating an AVD</a></li>
+        <li><a href="#RunningAnApplication">Running an application</a></li>
+      </ol>
+    </li>
+    <li><a href="#RunConfig">Creating a Custom Run Configuration</a></li>
+    <li><a href="#Signing">Setting Up Application Signing</a></li>
+    <li><a href="#Tips">Eclipse Tips</a></li>
+  </div>
+</div>
+
+
+<p>The Android Development Tools (ADT) plugin for Eclipse adds powerful extensions to the Eclipse 
+integrated development environment. It allows you to create and debug Android applications easier 
+and faster. If you use Eclipse, the ADT plugin gives you an incredible boost in developing Android 
+applications:</p>
 
 <ul>
-  <li>It gives you access to other Android development tools from inside the Eclipse IDE. For example, ADT lets you access the many capabilities of the DDMS tool: take screenshots, manage port-forwarding, set breakpoints, and view thread and process informationd irectly from Eclipse.</li>
-  <li>It provides a New Project Wizard, which helps you quickly create and set up all of the basic files you'll need for a new Android application.</li>
+  <li>It gives you access to other Android development tools from inside the Eclipse IDE. For 
+example, ADT lets you access the many capabilities of the DDMS tool: take screenshots, manage 
+port-forwarding, set breakpoints, and view thread and process informationd irectly from Eclipse.</li>
+  <li>It provides a New Project Wizard, which helps you quickly create and set up all of the 
+basic files you'll need for a new Android application.</li>
   <li>It automates and simplifies the process of building your Android application.</li>
-  <li>It provides an Android code editor that helps you write valid XML for your Android manifest and resource files.</li>
+  <li>It provides an Android code editor that helps you write valid XML for your Android 
+manifest and resource files.</li>
+  <li>It will even export your project into a signed APK, which can be distributed to users.</li>
 </ul>
 
-<p>To begin developing Android applications in the Eclipse IDE with ADT, you first need to download the Eclipse IDE and then download and install the ADT plugin. To do so, follow the steps given in <a href="{@docRoot}sdk/1.1_r1/installing.html#installingplugin">Installing the ADT Plugin</a>, in the installation documentation included with your SDK package. </p>
-
-<p>Once you've installed the ADT plugin, you begin by creating an Android 
-project and then set up a launch configuration. After that, you can write, run, and debug 
-your application.  </p>
+<p>To begin developing Android applications in the Eclipse IDE with ADT, you first need to 
+download the Eclipse IDE and then download and install the ADT plugin. To do so, follow the 
+steps given in <a href="{@docRoot}sdk/1.5_r1/installing.html#installingplugin">Installing 
+the ADT Plugin</a>.</p>
 
-<p>The sections below provide instructions assuming that you have installed the ADT plugin 
-in your Eclipse environment. If you haven't installed the ADT plugin, you should do that 
-before using the instructions below. </p>
+<p>If you are already developing applications using a version of ADT earlier than 0.9, make
+sure to upgrade to the latest version before continuing. See the guide to
+<a href="{@docRoot}sdk/1.5_r1/upgrading.html#UpdateAdt">Update Your Eclipse ADT Plugin</a>.</p>
 
-<a name="creatingaproject" id="creatingaproject"></a>
+<p class="note"><strong>Note:</strong> This guide assumes you are using the latest version of
+the ADT plugin (0.9). While most of the information covered also applies to previous 
+versions, if you are using an older version, you may want to consult this document from
+the set of documentation included in your SDK package (instead of the online version).</p>
 
-<h2>Creating an Android Project</h2>
 
-<p>The ADT plugin provides a New Project Wizard that you can use to quickly create an 
-Eclipse project for new or existing code. To create the project, follow these steps:</p>
+<h2  id="CreatingAProject">Creating an Android Project</h2>
 
-<a name="existingcode"></a>
+<p>The ADT plugin provides a New Project Wizard that you can use to quickly create a new
+Android project (or a project from existing code). To create a new project:</p>
 
 <ol>
-    <li>Select <strong>File</strong> &gt; <strong>New</strong> &gt; <strong>Project</strong></li>
-    <li>Select <strong>Android</strong> &gt; <strong>Android Project</strong>, and press <strong>Next</strong></li>
-    <li>Select the contents for the project:
-		<ul>
-			<li>Select <strong>Create new project in workspace</strong> to start a project for new code. 
-			<p>Enter the project name, the base package name, the name of a single Activity class to create as a stub .java file, and a name to use for your application.</p></li>
-			<li>Select <strong>Create project from existing source</strong> to start a project from existing code. Use this option if you want to build and run any of the sample applications included with the SDK. The sample applications are located in the samples/ directory in the SDK. 
-                        <p>Browse to the directory containing the existing source code and click OK. If the directory contains a valid Android manifest file, the ADT plugin fills in the package, activity, and application names for you.</p>
-                        </li>
-                </ul>
-    </li>
-    <li>Press <strong>Finish</strong>.</li>
-</ol>
-
-<p>The ADT plugin creates the these folders and
-        files for you as appropriate for the type of project:</p>
-
+  <li>Select <strong>File</strong> &gt; <strong>New</strong> &gt; <strong>Project</strong>.</li>
+  <li>Select <strong>Android</strong> &gt; <strong>Android Project</strong>, and click
+    <strong>Next</strong>.</li>
+  <li>Select the contents for the project:
+    <ul>
+      <li>Enter a <em>Project Name</em>. This will be the name of the folder where your
+        project is created.</li>
+      <li>Under Contents, select <strong>Create new project in workspace</strong>.
+        Select your project workspace location.</li>
+      <li>Under Target, select an Android target to be used as the project's Build Target. 
+        The Build Target
+        specifies which Android platform you'd like your application built against.
+        <p>Unless you know that you'll be using new APIs introduced in the latest SDK, you should
+        select a target with the lowest platform version possible, such as Android 1.1.</p>
+        <p class="note"><strong>Note:</strong> You can change your the Build Target for your 
+        project at any time: Right-click the project in the Package Explorer, select
+        <strong>Properties</strong>, select <strong>Android</strong> and then check 
+        the desired Project Target.</p>
+      </li>
+      <li>Under Properties, fill in all necessary fields.
         <ul>
-            <li>src/&nbsp;&nbsp;&nbsp;A
-                folder that includes your stub .java Activity file.</li>
-            <li>res/&nbsp;&nbsp;&nbsp;A folder for your
-                resources.</li>
-            <li>AndroidManifest.xml&nbsp;&nbsp;&nbsp;The
-                manifest for your project.   </li>
+          <li>Enter an <em>Application name</em>. This is the human-readable title for your 
+            application &mdash; the name that will appear on the Android device.</li>
+          <li>Enter a <em>Package name</em>. This is the package namespace (following the same rules
+            as for packages in the Java programming language) where all your source code
+            will reside.</li>
+          <li>Select <em>Create Activity</em> (optional, of course, but common) and enter a name
+            for your main Activity class.</li>
+          <li>Enter a <em>Min SDK Version</em>. This is an integer that indicates
+            the minimum API Level required to properly run your application. 
+            Entering this here automatically sets the <code>minSdkVersion</code> attribute in the 
+            <a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html">&lt;uses-sdk&gt;</a>
+            of your Android Manifest file. If you're unsure of the appropriate API Level to use,
+            copy the API Level listed for the Build Target you selected in the Target tab.</li>
         </ul>
-
+      </li>
+    </ul>
+  </li>
+  <li>Click <strong>Finish</strong>.</li>
 </ol>
 
-<a name="launchconfig" id="launchconfig"></a>
+<p class="note"><strong>Tip:</strong>
+You can also start the New Project Wizard from the <em>New</em> icon in the toolbar.</p>
+
+<p>Once you complete the New Project Wizard, ADT creates the following 
+folders and files in your new project:</p>
+  <dl>
+    <dt><code>src/</code></dt>
+      <dd>Includes your stub Activity Java file. All other Java files for your application
+      go here.</dd>
+    <dt><code><em>&lt;Android Version&gt;</em>/</code> (e.g., <code>Android 1.1/</code>)</dt>
+      <dd>Includes the <code>android.jar</code> file that your application will build against. 
+      This is determined by the build target that you have chosen in the <em>New Project
+      Wizard</em>.</dd>
+    <dt><code>gen/</code></dt>
+      <dd>This contains the Java files generated by ADT, such as your <code>R.java</code> file
+      and interfaces created from AIDL files.</dd>
+    <dt><code>assets/</code></dt>
+      <dd>This is empty. You can use it to store raw asset files. See 
+      <a href="{@docRoot}guide/topics/resources/index.html">Resources and Assets</a>.</dd>
+    <dt><code>res/</code></dt>
+      <dd>A folder for your application resources, such as drawable files, layout files, string
+      values, etc. See 
+      <a href="{@docRoot}guide/topics/resources/index.html">Resources and Assets</a>.</dd>
+    <dt><code>AndroidManifest.xml</code></dt>
+      <dd>The Android Manifest for your project. See 
+      <a href="{@docRoot}guide/topics/manifest/manifest-intro.html">The AndroidManifest.xml 
+      File</a>.</dd>
+    <dt><code>default.properties</code></dt>
+      <dd>This file contains project settings, such as the build target. This files is integral
+      to the project, as such, it should be maintained in a Source Revision Control system. 
+      It should never be edited manually &mdash; to edit project properties, 
+      right-click the project folder and select "Properties".</dd>
+  </dl>
+
+
+<h2 id="Running">Running Your Application</h2>
+
+<p><em>Wait!</em> Before you can run your application on the Android Emulator, 
+you <strong>must</strong> create an Android Virtual Device (AVD). 
+An AVD is a configuration that specifies the Android platform to be used on the emulator.
+You can read more about AVDs in the <a href="{@docRoot}guide/developing/index.html#avd">Developing
+Overview</a>, but if you just want to get started, follow the simple guide below to create
+an AVD.</p>
+
+<p>If you will be running your applications only on actual device hardware, you do not 
+need an AVD &mdash; see 
+<a href="{@docRoot}guide/developing/device.html">Developing On a Device</a> for information
+on running your applicaiton.</p>
+
+<h3 id="CreatingAnAvd">Creating an AVD</h3>
+
+<p>To avoid some explanation that's beyond the scope of this document, here's the 
+basic procedure to create an AVD:</p>
 
-<h2>Creating a Launch Configuration </h2>
+<ol>
+  <li>Open a command-line (e.g.,"Command Prompt" application on Windows, or "Terminal"
+  on Mac/Linux) and navigate to your SDK package's 
+  <code>tools/</code> directory.</li>
+  <li>First, you need to select a Deployment Target. To view available targets, execute:
+    <pre>android list targets</pre>
+    <p>This will output a list of available Android targets, such as:</p>
+<pre>
+id:1
+    Name: Android 1.1
+    Type: platform
+    API level: 2
+    Skins: HVGA (default), HVGA-L, HVGA-P, QVGA-L, QVGA-P
+id:2
+    Name: Android 1.5
+    Type: platform
+    API level: 3
+    Skins: HVGA (default), HVGA-L, HVGA-P, QVGA-L, QVGA-P
+</pre>
+    <p>Find the target that matches the Android platform upon which you'd like
+    to run your application. Note the integer value of the <code>id</code> &mdash;
+    you'll use this in the next step.</p>
+  </li>
+  <li>Create a new AVD using your selected Deployment Target. Execute:
+    <pre>android create avd --name <em>&lt;your_avd_name&gt;</em> --target <em>&lt;targetID&gt;</em></pre>
+  <li>Next, you'll be asked whether you'd like to create a custom hardware profile.
+  If you respond "yes," you'll be presented with a series of prompts to define various aspects of the
+  device hardware (leave entries blank to use default values, which are shown in brackets). Otherwise,
+  press return to use all default values ("no" is the default).</li>
+  </li>
+</ol>
 
-<p>Before you can run and debug your application in Eclipse, you must create a launch configuration for it. A launch configuration specifies the project to launch, the Activity to start, the emulator options to use, and so on. </p>
+<p>That's it; your AVD is ready. In the next section, you'll see how the AVD is used
+when launching your application on an emulator.</p>
 
-<p>To create a launch configuration for the application, follow these steps as appropriate for your Eclipse version:</p>
+<p>To learn more about creating and managing AVDs, please read the 
+<a href="{@docRoot}guide/developing/index.html#avd">Developing Overview</a> 
+and <a href="{@docRoot}guide/tools/android.html">android Tool</a> documentation.</p>
 
-<ol>
 
-    <li>Open the launch configuration manager.
-         <ul>
-            <li>In Eclipse 3.3 (Europa), select <strong>Run </strong>&gt; 
-              <strong>Open Run Dialog... </strong>or <strong>Run </strong>&gt; 
-              <strong>Open Debug Dialog... </strong>as appropriate.
-            </li>
-            <li>In Eclipse 3.4 (Ganymede), select <strong>Run </strong>&gt; 
-              <strong>Run Configurations... </strong>or <strong>Run </strong>&gt; 
-              <strong>Debug Configurations... </strong>as appropriate.
-            </li>
-        </ul>
-    </li>
-    <li>In the project type list on the left, locate the <strong> Android Application</strong> item and double-click it (or right-click &gt; <strong>New</strong>), to create a new launch configuration.</li>
-    <li>Enter a name for your configuration.</li>
-    <li>On the Android tab, browse for the project and Activity to start.</li>
-    <li>On the Target tab, set the desired screen and network properties, as well as any other <a href="{@docRoot}guide/developing/tools/emulator.html#startup-options">emulator startup options</a>.</li>
-    <li>You can set additional options on the Common tab as desired.</li>
-	<li>Press <strong>Apply</strong> to save the launch configuration, or press <strong>Run</strong> or <strong>Debug</strong> (as appropriate).</li>
+<h3 id="RunningYourApplication">Running your application</h3>
 
-</ol>
+<p class="note"><strong>Note:</strong> Before you can run your application, be sure that
+you have created an AVD with a target that satisfies your application's Build Target. 
+If an AVD cannot be found that meets the requirements of your Build Target, you will see
+a console error telling you so and the launch will be aborted.</p>
 
+<p>To run (or debug) your application, select <strong>Run</strong> &gt; <strong>Run</strong> (or 
+<strong>Run</strong> &gt; <strong>Debug</strong>) from the Eclipse main menu. The ADT plugin
+will automatically create a default launch configuration for the project.</p>
 
-<h2 id="sign_in_adt">Setting Up Application Signing</h2>
+<p>When you choose to run or debug your application, Eclipse will perform the following:</p>
 
-<p>As you begin developing Android applications, you should understand that all
-Android applications must be digitally signed before the system will install
-them on the emulator or an actual device. </p>
+<ol>
+  <li>Compile the project (if there have been changes since the last build).</li>
+  <li>Create a default launch configuration (if one does not already exist for the project).</li>
+  <li>Install and start the application on an emulator or device (based on the Deployment Target
+    defined by the run configuration).
+    <p>By default, Android application run configurations use an "automatic target" mode for 
+    selecting a device target. For information on how automatic target mode selects a 
+    deployment target, see <a href="#AutoAndManualTargetModes">Automatic and manual 
+    target modes</a> below.</p>
+  </li>
+</ol>
 
-<p>The ADT plugin helps you get started quickly by signing your .apk files with
-a debug key, prior to installing them on the emulator. This means that you can
-compile your application and install it on the emulator without having to
-generate your own private key. However, please note that if you intend to
-publish your application, you <em>must</em> sign the application with your own
-private key, rather than the debug key generated by the SDK tools. </p>
+<p>If debugging, the application will start in the "Waiting For Debugger" mode. Once the 
+debugger is attached, Eclipse will open the Debug perspective.</p>
+
+<p>To set or change the launch configuration used for your project, use the launch configuration manager. 
+See <a href="#launchconfig">Creating a Launch Configuration</a> for information.</p>
 
-<p>To sign your applications, the ADT plugin requires the Keytool utility
-included in the JDK. To set up your development environment for
-signing, you need to make sure that Keytool is available on your
-machine that the ADT plugin knows how to find it. </p>
 
-<p>In most cases, you can tell the SDK build tools how to find Keytool by making
-sure that your JAVA_HOME environment variable is set and that it references a 
-suitable JDK. Alternatively, you can add the JDK version of Keytool to your 
-PATH variable.</p>
+<h2 id="RunConfig">Creating a Run Configuration</h2>
 
-<p>If you are developing on a version of Linux that originally came with Gnu
-Compiler for Java, make sure that the system is using the JDK version of
-Keytool, rather than the gcj version. If keytool is already in your PATH, it
-might be pointing to a symlink at /usr/bin/keytool. In this case, check the
-symlink target to make sure that it points to the keytool in the JDK.</p>
+<p>The run configuration specifies the project to run, the Activity 
+to start, the emulator options to use, and so on. When you first run a project
+as an <em>Android Application</em>, ADT will automatically create a run configuration.
+The default run configuration will
+launch the default project Activity and use automatic target mode for device selection 
+(with no preferred AVD). If the default setting don't suit your project, you can 
+customize the launch configuration or even create a new.</p>
 
-<p>In all cases, please read and understand <a
-href="{@docRoot}guide/publishing/app-signing.html">Signing Your
-Applications</a>, which provides an overview of application signing on Android
-and what it means to you as an Android application developer. </p>
+<p>To create or modify a launch configuration, follow these steps as appropriate 
+for your Eclipse version:</p>
 
+<ol>
+  <li>Open the run configuration manager.
+        <ul>
+          <li>In Eclipse 3.3 (Europa), select <strong>Run</strong> &gt; 
+            <strong>Open Run Dialog</strong> (or <strong>Open Debug Dialog</strong>)
+          </li>
+          <li>In Eclipse 3.4 (Ganymede), select <strong>Run </strong>&gt; 
+            <strong>Run Configurations</strong> (or
+            <strong>Debug Configurations</strong>)
+          </li>
+      </ul>
+  </li>
+  <li>Expand the <strong>Android Application</strong> item and create a new
+  configuration or open an existing one.
+    <ul>
+      <li>To create a new configuration:
+        <ol>
+          <li>Select <strong>Android Application</strong> and click the <em>New launch configuration</em>
+          icon above the list (or, right-click  <strong>Android Application</strong> and click 
+          <strong>New</strong>).</li>
+          <li>Enter a Name for your configuration.</li>
+          <li>In the Android tab, browse and select the project you'd like to run with the
+          configuration.</li>
+        </ol>
+      <li>To open an existing configuration, select the configuration name from the list
+      nested below <strong>Android Application</strong>.</li>
+    </ul>
+  </li>
+  <li>Adjust your desired launch configuration settings.
+    <p>In the Target tab, consider whether you'd like to use Manual or Automatic mode
+    when selecting an AVD to run your application.
+    See the following section on <a href=#AutoAndManualModes">Automatic and manual target 
+    modes</a>).</p>
+  </li>
+</ol>
 
-<a name="installingrunningdebugging" id="installingrunningdebugging"></a>
 
-<h2>Running and Debugging an Application</h2>
+<h3 id="AutoAndManualTargetModes">Automatic and manual target modes</h3>
 
-<p>Once you've set up the project and launch configuration for your application, you can run or debug it as described below.</p>
+<p>By default, a run configuration uses the <strong>automatic</strong> target mode in order to select
+an AVD. In this mode, ADT will select an AVD for the application in the following manner:</p>
 
-From the Eclipse main menu, select <strong>Run</strong> &gt; <strong>Run</strong> or <strong>Run</strong> &gt; <strong>Debug</strong> as appropriate, to run or debug the active launch configuration. </li>
+<ol>
+  <li>If there's a device or emulator already running and its AVD configuration
+  meets the requirements of the application's build target, the application is installed
+  and run upon it.</li>
+  <li>If there's more than one device or emulator running, each of which meets the requirements
+  of the build target, a "device chooser" is shown to let you select which device to use.</li>
+  <li>If there are no devices or emulators running that meet the requirements of the build target, 
+  ADT looks at the available AVDs. If one meets the requirements of the build target,
+  the AVD is used to launch a new emulator, upon which the application is installed and run.</li>
+  <li>If all else fails, the application will not be run and you will see a console error warning
+  you that there is no existing AVD that meets the build target requirements.</li>
+</ol>
 
-<p>Note that the active launch configuration is the one most recently selected in the Run configuration manager. It does not necessarily correspond to the application that is selected in the Eclipse Navigation pane (if any).</p>
+<p>However, if a "preferred AVD" is selected in the run configuration, then the application 
+will <em>always</em> be deployed to that AVD. If it's not already running, then a new emulator
+will be launched.</p>
 
-<p>To set or change the active launch configuration, use the launch configuration manager. See <a href="#launchconfig">Creating a Launch Configuration</a> for information about how to access the launch configuration manager.</strong>.</p>
+<p>If your run configuration uses <strong>manual</strong> mode, then the "device chooser" 
+is presented every time that your application is run, so that you can select which AVD to use.</p>
 
-<p>Running or debugging the application triggers these actions:</p>
-<ul><li>Starts the emulator, if it is not already running. </li>
-                    <li>Compiles the project, if there have been changes since the last build, and installs the application on the emulator. </li>
-                    <li><strong>Run</strong> starts the application. </li>
-            		<li><strong>Debug</strong> starts the application in "Wait for debugger" mode, then opens the Debug perspective and attaches the Eclipse Java debugger to the application.</li>
 
-        </ul>
+<h2 id="Signing">Signing your Applications</h2>
 
+<p>As you begin developing Android applications, understand that all
+Android applications must be digitally signed before the system will install
+them on an emulator or an actual device. There are two ways to do this:
+with a debug key (for immediate testing on an emulator or development device)
+or with a private key (for application distribution).</p>
 
-<h2 id="tips">Eclipse Tips </h2>
-	<h3>Executing arbitrary Java expressions in Eclipse<a name="arbitraryexpressions" id="arbitraryexpressions"></a></h3>
-	<p>You can execute arbitrary code when paused at a breakpoint in Eclipse. For example,
-	    when in a function with a String argument called &quot;zip&quot;, you can get
-	    information about packages and call class methods. You can also invoke arbitrary
-	    static methods: for example, entering <code>android.os.Debug.startMethodTracing()</code> will
-	    start dmTrace. </p>
-	<p>Open a code execution window, select <strong>Window</strong>&gt;<strong>Show
-	        View</strong>&gt;<strong>Display</strong> from the main menu to open the
-	        Display window, a simple text editor. Type your expression, highlight the
-	        text, and click the 'J' icon (or CTRL + SHIFT + D) to run your
-	        code. The code runs in the context of the selected thread, which must be
-	        stopped at a breakpoint or single-step point. (If you suspend the thread
-	        manually, you have to single-step once; this doesn't work if the thread is
-	        in Object.wait().)</p>
-	<p>If you are currently paused on a breakpoint, you can simply highlight and execute
-	    a piece of source code by pressing CTRL + SHIFT + D. </p>
-	<p>You can highlight a block of text within the same scope by pressing ALT +SHIFT
-	    + UP ARROW to select larger and larger enclosing blocks, or DOWN ARROW to select
-	    smaller blocks. </p>
-	<p>Here are a few sample inputs and responses in Eclipse using the Display window.</p>
-	<table width="100%" border="1">
-	    <tr>
-	        <th scope="col">Input</th>
-	        <th scope="col">Response</th>
-	    </tr>
-	    <tr>
-	        <td><code>zip</code></td>
-	        <td><code>(java.lang.String) /work/device/out/linux-x86-debug/android/app/android_sdk.zip</code></td>
-	    </tr>
-	    <tr>
-	        <td><code>zip.endsWith(&quot;.zip&quot;)</code></td>
-	        <td><code>(boolean) true</code></td>
-	    </tr>
-	    <tr>
-	        <td><code>zip.endsWith(&quot;.jar&quot;)</code></td>
-	        <td><code>(boolean) false</code></td>
-	    </tr>
-	</table>
-	<p>You can also execute arbitrary code when not debugging by using a scrapbook page.
-	    Search the Eclipse documentation for &quot;scrapbook&quot;.</p>
-	
-		<h3>Running DDMS Manually</h3>
-
-		<p>Although the recommended way to debug is to use the ADT plugin, you can manually run DDMS and configure Eclipse to debug on port 8700. (<strong>Note: </strong>Be sure that you have first started <a href="{@docRoot}guide/developing/tools/ddms.html">DDMS</a>). </p>
+<p>The ADT plugin helps you get started quickly by signing your .apk files with
+a debug key, prior to installing them on an emulator or development device. This means that you can
+quickly run your application from Eclipse without having to
+generate your own private key. No specific action on your part is needed, 
+provided ADT has access to Keytool.However, please note that if you intend
+to publish your application, you <strong>must</strong> sign the application with your
+own private key, rather than the debug key generated by the SDK tools.</p>
+
+<p>Please read <a href="{@docRoot}guide/publishing/app-signing.html">Signing Your
+Applications</a>, which provides a thorough guide to application signing on Android
+and what it means to you as an Android application developer. The document also includes
+a guide to exporting and signing your application with the ADT's Export Wizard.</p>
+
+
+<h2 id="Tips">Eclipse Tips </h2>
+
+<h3 id="arbitraryexpressions">Executing arbitrary Java expressions in Eclipse</h3>
+
+<p>You can execute arbitrary code when paused at a breakpoint in Eclipse. For example,
+    when in a function with a String argument called &quot;zip&quot;, you can get
+    information about packages and call class methods. You can also invoke arbitrary
+    static methods: for example, entering <code>android.os.Debug.startMethodTracing()</code> will
+    start dmTrace. </p>
+<p>Open a code execution window, select <strong>Window</strong>&gt;<strong>Show
+        View</strong>&gt;<strong>Display</strong> from the main menu to open the
+        Display window, a simple text editor. Type your expression, highlight the
+        text, and click the 'J' icon (or CTRL + SHIFT + D) to run your
+        code. The code runs in the context of the selected thread, which must be
+        stopped at a breakpoint or single-step point. (If you suspend the thread
+        manually, you have to single-step once; this doesn't work if the thread is
+        in Object.wait().)</p>
+<p>If you are currently paused on a breakpoint, you can simply highlight and execute
+    a piece of source code by pressing CTRL + SHIFT + D. </p>
+<p>You can highlight a block of text within the same scope by pressing ALT +SHIFT
+    + UP ARROW to select larger and larger enclosing blocks, or DOWN ARROW to select
+    smaller blocks. </p>
+<p>Here are a few sample inputs and responses in Eclipse using the Display window.</p>
+
+<table width="100%" border="1">
+    <tr>
+        <th scope="col">Input</th>
+        <th scope="col">Response</th>
+    </tr>
+    <tr>
+        <td><code>zip</code></td>
+        <td><code>(java.lang.String) 
+        /work/device/out/linux-x86-debug/android/app/android_sdk.zip</code></td>
+    </tr>
+    <tr>
+        <td><code>zip.endsWith(&quot;.zip&quot;)</code></td>
+        <td><code>(boolean) true</code></td>
+    </tr>
+    <tr>
+        <td><code>zip.endsWith(&quot;.jar&quot;)</code></td>
+        <td><code>(boolean) false</code></td>
+    </tr>
+</table>
+<p>You can also execute arbitrary code when not debugging by using a scrapbook page.
+    Search the Eclipse documentation for &quot;scrapbook&quot;.</p>
+
+
+<h3>Running DDMS Manually</h3>
+
+<p>Although the recommended way to debug is to use the ADT plugin, you can manually run 
+DDMS and configure Eclipse to debug on port 8700. (<strong>Note: </strong>Be sure that you 
+have first started <a href="{@docRoot}guide/developing/tools/ddms.html">DDMS</a>). </p>
+
+
+<!-- TODO: clean this up and expand it to cover more wizards and features
+<h3>ADT Wizards</h3>
+
+<p>Notice that the "New Android Project" wizard has been expanded to use the multi-platform
+capabilities of the new SDK.</p>
+
+<p>There is now a "New XML File" wizard that lets you create skeleton XML resource
+files for your Android projects. This makes it easier to create a new layout, a new menu, a
+new strings file, etc.</p>
+
+<p>Both wizards are available via <strong>File > New</strong> and new icons in the main
+Eclipse toolbar (located to the left of the Debug and Run icons). 
+If you do not see the new icons, you may need to select <strong>Window > Reset
+Perspective</strong> from the Java perspective.</p>
+-->
diff --git a/docs/html/guide/developing/other-ide.jd b/docs/html/guide/developing/other-ide.jd
index 7bcb509a4f4e..5db4f8d19b22 100644
--- a/docs/html/guide/developing/other-ide.jd
+++ b/docs/html/guide/developing/other-ide.jd
@@ -1,167 +1,408 @@
-page.title=In Other IDEs
+page.title=Developing In Other IDEs
 @jd:body
 
+<div id="qv-wrapper">
+<div id="qv">
+  <h2>In this document</h2>
+  <ol>
+    <li><a href="#CreatingAProject">Creating an Android Project</a></li>
+    <li><a href="#Signing">Preparing to Sign Your Application</a></li>
+    <li><a href="#Building">Building Your Application</a>
+      <ol>
+        <li><a href="#DebugMode">Building in debug mode</a></li>
+        <li><a href="#ReleaseMode">Building in release mode</a></li>
+      </ol>
+    </li>
+    <li><a href="#Running">Running Your Application</a></li>
+    <li><a href="#AttachingADebugger">Attaching a Debugger to Your Application</a></li>
+  </ol>
+
+  <h2>See also</h2>
+  <ol>
+    <li><a href="{@docRoot}guide/developing/tools/android.html">android Tool</a></li>
+    <li><a href="{@docRoot}guide/developing/tools/emulator.html">Android Emulator</a></li>
+    <li><a href="{@docRoot}guide/developing/tools/adb.html">Android Debug Bridge</a></li>
+  </ol>
+</div>
+</div>
+
 <p>The recommended way to develop an Android application is to use 
-        <a href="{@docRoot}guide/developing/eclipse-adt.html">Eclipse with the Android
-        Development Tools (ADT) plugin</a>, provided in the SDK. The ADT plugin 
-        provides editing, building,and debugging functionality integrated right into the IDE. </p>
+<a href="{@docRoot}guide/developing/eclipse-adt.html">Eclipse with the ADT plugin</a>.
+The ADT plugin provides editing, building, debugging, and .apk packaging and signing functionality 
+integrated right into the IDE.</p>
 
-<p>However, if you'd rather develop your application in another IDE, such as IntelliJ, 
-        or use Eclipse without the ADT plugin, you can do that instead. The SDK
-	provides the tools you need to set up, build, and debug your application. 
- </p>
+<p>However, if you'd rather develop your application in another IDE, such as IntelliJ,
+or in a basic editor, such as Emacs, you can do that instead. The SDK
+includes all the tools you need to set up an Android project, build it, debug it and then
+package it for distribution. This document is your guide to using these tools.</p>
 
 
-<h2>Creating an Android Project </h2>
+<h2 id="EssentialTools">Essential Tools</h2>
 
-<p>The Android SDK includes <code>activityCreator</code>, a program that generates a number of stub files for your project, as well as a build file. You can use the program to create an Android project for new code or from existing code, such as the sample applications included in the SDK. For Linux and Mac, the SDK provides <code>activitycreator</code> and for Windows, <code>activityCreator.bat</code>, a batch script. Regardless of platform, you can use <code>activitycreator</code> in the same way. </p>
+<p>When developing in IDEs or editors other than Eclipse, you'll require
+familiarity with the following Android SDK tools:</p>
 
-<p>To run <code>activityCreator</code> and create an Android project, follow these steps:</p>
+<dl>
+  <dt><a href="{@docRoot}guide/developing/tools/android.html">android</a></dt>
+    <dd>To create/update Android projects and to create/move/delete AVDs.</dd>
+  <dt><a href="{@docRoot}guide/developing/tools/emulator.html">Android Emulator</a></dt>
+    <dd>To run your Android applications on an emulated Android platform.</dd>
+  <dt><a href="{@docRoot}guide/developing/tools/adb.html">Android Debug Bridge</a></dt>
+    <dd>To interface with your emulator or connected device (install apps,
+    shell the device, issue commands, etc.).
+    </dd>
+</dl>
+
+<p>In addition to the above tools, included with the SDK, you'll use the following
+open source and third-party tools:</p>
+
+<dl>
+  <dt>Ant</dt>
+    <dd>To compile and build your Android project into an installable .apk file.</dd>
+  <dt>Keytool</dt>
+    <dd>To generate a keystore and private key, used to sign your .apk file.</dd>
+  <dt>Jarsigner (or similar signing tool)</dt>
+    <dd>To sign your .apk file with a private key generated by keytool.</dd>
+</dl>
+
+<p>In the topics that follow, you'll be introduced to each of these tools as necessary.
+For more advanced operations, please read the respective documentation for each tool.</p>
+
+
+<h2 id="CreatingAProject">Creating an Android Project</h2>
+
+<p>To create an Android project, you must use the <code>android</code> tool. When you create
+a new project with <code>android</code>, it will generate a project directory
+with some default application files, stub files, configuration files and a build file.</p>
 
-<ol>
-    <li> In the command line, change to the <code>tools/</code> directory of the SDK and create a new directory for your project files. If you are creating a project from existing code, change to the root folder of your application instead. </li>
 
-    <li><p>Run <code>activityCreator</code>. In the command, you must specify a fully-qualified class name as an argument. If you are creating a project for new code, the class represents the name of a stub class that the script will create. If you are creating a project from existing code, you must specify the name of one Activity class in the package. Command options for the script include:
+<h3 id="CreatingANewProject">Creating a new Project</h3>
+
+<p>If you're starting a new project, use the <code>android create project</code>
+command to generate all the necessary files and folders.</p>
+
+<p>To create a new Android project, open a command-line,
+navigate to the <code>tools/</code> directory of your SDK and run:</p>
+<pre>
+android create project \
+--target <em>&lt;targetID&gt;</em> \
+--path <em>/path/to/your/project</em> \
+--activity <em>&lt;your_activity_name&gt;</em> \
+--package <em>&lt;your_package_namespace&gt;</em>
+</pre>
+
 <ul>
-	<li><code>--out &lt;folder&gt;</code> which sets the output directory. By default, the output directory is the current directory. If you created a new directory for your project files, use this option to point to it. </li>
-	<li><code>--ide intellij</code>, which generates IntelliJ IDEA project files in the newly created project</li>
+  <li><code>target</code> is the "build target" for your application. It corresponds
+  to an Android platform library (including any add-ons, such as Google APIs) that you would like to
+  build your project against. To see a list of available targets and their corresponding IDs, 
+  execute: <code>android list targets</code>.</li>
+  <li><code>path</code> is the location of your project directory. If the directory does not exist,
+  it will be created for you.</li>
+  <li><code>activity</code> is the name for your {@link android.app.Activity} class. This class file
+  will be created for you inside 
+  <code><em>&lt;path_to_your_project&gt;</em>/src/<em>&lt;your_package_namespace_path&gt;</em>/</code>.</li>
+  <li><code>package</code> is the package namespace for your project, following the same rules as for
+  packages in the Java programming language.</li>
 </ul>
-</li>
-</ol>
 
-<p>Here's an example:</p>	
+<p>Here's an example:</p>
 <pre>
-~/android_linux_sdk/tools $ ./activityCreator.py --out myproject your.package.name.ActivityName
-package: your.package.name
-out_dir: myproject
-activity_name: ActivityName
-~/android_linux_sdk/tools $ </pre>
+android create project \
+--target 1 \
+--path ./myProject \
+--activity MyActivity \
+--package com.example.myproject
+</pre>
 
-<p>The <code>activityCreator</code> script generates the following files and directories (but will not overwrite existing ones):</p>
+<p>The tool generates the following files and directories:</p>
 
 <ul>
-    <li><code>AndroidManifest.xml</code> The application manifest file, synced to the specified Activity class for the project.</li>
-    <li><code>build.xml</code> An <code>Ant</code> file that you can use to build/package the application.</li>
-    <li><code>src<em>/your/package/name/ActivityName</em>.java</code>&nbsp;The Activity class you specified on input.</li>
-    <li><code><em>your_activity</em>.iml, <em>your_activity</em>.ipr, 
-        <em>your_activity</em>.iws&nbsp;&nbsp;&nbsp;</code> [<em>only
-            with the <code>-ide intelliJ</code> flag</em>] intelliJ project
-            files. </li>
-    <li><code>res/</code> &nbsp;&nbsp;A directory to hold resources. </li>
-    <li><code>src/</code> &nbsp;&nbsp;&nbsp;The source directory.
-    <li><code>bin/</code> &nbsp;&nbsp;&nbsp;The output directory for the build script.</li>
+  <li><code>AndroidManifest.xml</code> - The application manifest file, 
+  synced to the specified Activity class for the project.</li>
+  <li><code>build.xml</code> - Build file for Ant.</li>
+  <li><code>default.properties</code> - Properties for the build system. <em>Do not modify 
+  this file</em>.</li>
+  <li><code>build.properties</code> - Customizable properties for the build system. You can edit this 
+  file to overried default build settings used by Ant.</li>
+  <li><code>src<em>/your/package/namespace/ActivityName</em>.java</code> - The Activity class 
+  you specified during project creation.</li>
+  <li><code>bin/</code>  - Output directory for the build script.</li>
+  <li><code>gen/</code>  - Holds <code>Ant</code>-generated files, such as <code>R.java</code>. </li>
+  <li><code>libs/</code>  - Holds private libraries.</li>
+  <li><code>res/</code>  - Holds project resources.</li>
+  <li><code>src/</code>  - Holds source code.</li>
+  <li><code>tests/</code>  - Holds a duplicate of all-of-the-above, for testing purposes.</li>
 </ul>
 
-<p>You can now move your folder wherever you want for development, but keep in mind
-    that you'll have to use the <a href="{@docRoot}guide/developing/tools/adb.html">adb</a> program in the <code>tools/</code> folder to
-    send files to the emulator, so you'll need access between your solution and 
-    the <code>tools/</code> folder. </p>
-
-<p>Also, you should refrain from moving the
-    location of the SDK directory, since this will break the build scripts (they
-    will need to be manually updated to reflect the new SDK location before they will
-    work again).</p>
-<a name="buidingwithant"></a>
-<h2 id="antbuild">Building the Application with Ant</h2>
-<p>Use the Ant <code>build.xml</code> file generated by 
-   <code>activityCreator</code> to build your application.</p>
-<ol>
-  <li>If you don't have it, you can obtain Ant from the 
-    <a href="http://ant.apache.org/">Apache Ant home page</a>. Install it and make
-    sure it is on your executable path. </li>
-	<li>Before calling Ant, you need to declare the JAVA_HOME environment variable to specify the path to where the JDK is installed.
-        <p class="note"><strong>Note:</strong> When installing JDK on Windows, the default is to install in the "Program Files" directory. This location will cause <code>ant</code> to fail, because of the space. To fix the problem, you can specify the JAVA_HOME variable like this: <code>set JAVA_HOME=c:\Prora~1\Java\<jdkdir></code>. The easiest solution, however, is to install JDK in a non-space directory, for example: <code>c:\java\jdk1.6.0_02</code>. </p>
-        </li>
-	
-
-  <li>If you have not done so already, follow the instructions for Creating a 
-  New Project above to set up the project.</li>
-  <li>You can now run the Ant build file by simply typing ant in the same folder
-  as the build.xml file for your project. Each time you change
-  a source file or resource, you should run ant again and it will package up the
-  latest version of the application for you to deploy.</li>
-</ol>
+<p>Once you've created your project, you're ready to begin development.
+You can move your project folder wherever you want for development, but keep in mind
+that you must use the <a href="{@docRoot}guide/developing/tools/adb.html">Android Debug Bridge</a> 
+(adb) &mdash; located in the SDK <code>tools/</code> directory &mdash; to send your application 
+to the emulator (discussed later). So you need access between your project solution and 
+the <code>tools/</code> folder.</p>
+
+<p class="warning"><strong>Note:</strong> You should refrain from moving the
+location of the SDK directory, because this will break the build scripts. (They
+will need to be manually updated to reflect the new SDK location before they will
+work again.)</p>
+
 
-<h2 id="sign_in_other">Setting Up Application Signing</h2>
+<h3 id="UpdatingAProject">Updating a project</h3>
 
-<p>As you begin developing Android applications, you should understand that all
+<p>If you're upgrading a project from an older version of the Android SDK or want to create
+a new project from existing code, use the
+<code>android update project</code> command to update the project to the new development
+environment. You can also use this command to revise the build target of an existing project
+(with the <code>--target</code> option). The <code>android</code> tool will generate any files and 
+folders (listed in the previous section) that are either missing or need to be updated, 
+as needed for the Android project.</p>
+
+<p>To update an existing Android project, open a command-line
+and navigate to the <code>tools/</code> directory of your SDK. Now run:</p>
+<pre>
+android update project --target <em>&lt;targetID&gt;</em> --path <em>path/to/your/project/</em>
+</pre>
+
+<ul>
+  <li><code>target</code> is the "build target" for your application. It corresponds to 
+  an Android platform library (including any add-ons, such as Google APIs) that you would 
+  like to build your project against. To see a list of available targets and their corresponding IDs, 
+  execute: <code>android list targets</code>.</li>
+  <li><code>path</code> is the location of your project directory.</li>
+</ul>
+
+<p>Here's an example:</p>
+<pre>
+android update project --target 2 --path ./myProject
+</pre>
+
+
+<h2 id="Signing">Preparing to Sign Your Application</h2>
+
+<p>As you begin developing Android applications, understand that all
 Android applications must be digitally signed before the system will install
-them on the emulator or an actual device. </p>
+them on an emulator or device. There are two ways to do this:
+with a <em>debug key</em> (for immediate testing on an emulator or development device)
+or with a <em>private key</em> (for application distribution).</p>
 
-<p>The Android build tools help you get started quickly by signing your .apk
-files with a debug key, prior to installing them on the emulator. This means
+<p>The Android build tools help you get started by automatically signing your .apk
+files with a debug key at build time. This means
 that you can compile your application and install it on the emulator without
 having to generate your own private key. However, please note that if you intend
-to publish your application, you <em>must</em> sign the application with your
+to publish your application, you <strong>must</strong> sign the application with your
 own private key, rather than the debug key generated by the SDK tools. </p>
 
-<p>To sign your applications, the ADT plugin requires the Keytool utility
-included in the JDK. To set up your development environment for
-signing, all you need to do is make sure that Keytool is available on your
-machine that the build tools know how to find it. </p>
-
-<p>In most cases, you can tell the SDK build tools how to find Keytool by making
-sure that 
-your JAVA_HOME environment variable is set and that it references a suitable
-JDK. Alternatively, 
-you can add the JDK version of Keytool to your PATH variable.</p>
-
-<p>If you are developing on a version of Linux that originally came with Gnu
-Compiler for Java, 
-make sure that the system is using the JDK version of Keytool, rather than the
-gcj version. 
-If keytool is already in your PATH, it might be pointing to a symlink at
-/usr/bin/keytool. 
-In this case, check the symlink target to make sure that it points to the
-keytool in the JDK.</p>
-
-<p>In all cases, please read and understand <a
-href="{@docRoot}guide/publishing/app-signing.html">Signing Your
-Applications</a>, which provides an overview of application signing on Android
-and what it means to you as an Android application developer. </p>
-
-
-<h2>Running an Android Application</h2>
-<p>To run a compiled
-    application, you will upload the .apk file to the <code>/data/app/ </code>directory
-    in the emulator using the <a href="{@docRoot}guide/developing/tools/adb.html">adb</a> tool as described here:</p>
+<p>Please read <a href="{@docRoot}guide/publishing/app-signing.html">Signing Your
+Applications</a>, which provides a thorough guide to application signing on Android
+and what it means to you as an Android application developer.</p>
+
+
+
+<h2 id="Building">Building Your Application</h2>
+
+<p>There are two ways to build your application: one for testing/debugging your application
+&mdash; <em>debug mode</em> &mdash; and one for building your final package for release &mdash; 
+<em>release mode</em>. As described in the previous
+section, your application must be signed before it can be installed on an emulator
+or device.</p>
+
+<p>Whether you're building in debug mode or release mode, you
+need to use the Ant tool to compile and build your project. This will create the .apk file
+that is installed onto the emulator or device. When you build in debug mode, the .apk
+file is automatically signed by the SDK tools with a debug key, so it's instantly ready for installation
+(but only onto an emulator or attached development device).
+When you build in release mode, the .apk file is <em>unsigned</em>, so you must manually
+sign it with your own private key, using Keytool and Jarsigner.</p>
+
+<p>It's important that you read and understand 
+<a href="{@docRoot}guide/publishing/app-signing.html">Signing Your Applications</a>, particularly
+once you're ready to release your application and share it with end-users. That document describes
+the procedure for generating a private key and then using it to sign your .apk file.
+If you're just getting started, however, 
+you can quickly run your applications on an emulator or your own development device by building in
+debug mode.</p>
+
+<p>If you don't have Ant, you can obtain it from the 
+<a href="http://ant.apache.org/">Apache Ant home page</a>. Install it and make
+sure it is in your executable PATH. Before calling Ant, you need to declare the JAVA_HOME 
+environment variable to specify the path to where the JDK is installed.</p>
+
+<p class="note"><strong>Note:</strong> When installing JDK on Windows, the default is to install 
+in the "Program Files" directory. This location will cause <code>ant</code> to fail, because of 
+the space. To fix the problem, you can specify the JAVA_HOME variable like this: 
+<code>set JAVA_HOME=c:\Prora~1\Java\<jdkdir></code>. The easiest solution, however, is to 
+install JDK in a non-space directory, for example: <code>c:\java\jdk1.6.0_02</code>.</p>
+
+
+<h3 id="DebugMode">Building in debug mode</h3>
+
+<p>For immediate application testing and debugging, you can build your application 
+in debug mode and immediately install it on an emulator. In debug mode, the build tools automatically
+sign your application with a debug key. However, you can (and should) also test your
+application in release mode. Debug mode simply allows you to run your application without
+manually signing the application.</p>
+
+<p>To build in debug mode:</p>
+
+<ol>
+  <li>Open a command-line and navigate to the root of your project directory.</li>
+  <li>Use Ant to compile your project in debug mode:
+    <pre>ant debug</pre>
+    <p>This creates your Android application .apk file inside the project <code>bin/</code>
+    directory, named <code><em>&lt;your_DefaultActivity_name&gt;</em>-debug.apk</code>. The file
+    is already signed with the debug key.</p>
+  </li>
+</ol>
+
+<p>Each time you change a source file or resource, you must run Ant 
+again in order to package up the latest version of the application.</p>
+
+<p>To install and run your application on an emulator, see the following section
+about <a href="#Running">Running Your Application</a>.</p>
+
+
+<h3 id="ReleaseMode">Building in release mode</h3>
+
+<p>When you're ready to release and distribute your application to end-users, you must build
+your application in release mode. Once you have built in release mode, it's a good idea to perform 
+additional testing and debugging with the final .apk.</p>
+
+<p>To build in release mode:</p>
+
+<ol>
+  <li>Open a command-line and navigate to the root of your project directory.</li>
+  <li>Use Ant to compile your project in release mode:
+    <pre>ant release</pre>
+    <p>This creates your Android application .apk file inside the project <code>bin/</code>
+    directory, named <code><em>&lt;your_DefaultActivity_name&gt;</em>.apk</code>.</p>
+    <p class="note"><strong>Note:</strong> The .apk file is <em>unsigned</em> at this point.
+    You can't install it on an emulator or device until you sign it with your private key.</p>
+  </li>
+</ol>
+
+<p>Because release mode builds your application unsigned, your next step is to sign
+it with your private key, in order to distribute it to end-users. To complete this procedure, 
+read <a href="{@docRoot}guide/publishing/app-signing.html">Signing Your Applications</a>.</p>
+
+<p>Once you have signed your application with a private key, you can install it on an 
+emulator or device as discussed in the following section about 
+<a href="#Running">Running Your Application</a>.
+You can also try installing it onto a device from a web server.
+Simply upload the signed APK to a web site, then load the .apk URL in your Android web browser to 
+download the application and begin installation.
+(On your device, be sure you have enabled <em>Settings > Applications > Unknown sources</em>.)</p>
+
+
+<h2 id="Running">Running Your Application</h2>
+
+<p>Unless you'll be running your application on device hardware, 
+you need to launch an emulator upon which you will install your application.
+An instance of the Android emulator runs a specific Android platform with specific device configuration
+settings. The platform and configuration is defined with an Android Virtual Device (AVD). 
+So before you can launch your emulator, you must define an AVD.</p>
+
+<p>If you'll be running your application on device hardware, please read about
+<a href="{@docRoot}guide/developing/device.html">Developing On a Device</a> instead.</p>
+
 <ol>
-    <li>Start the emulator (run <code><em>&lt;your_sdk_dir&gt;</em>/tools/emulator</code> from the command line)</li>
-    <li>On the emulator, navigate to the home screen (it is best not to have that
-        application running when you reinstall it on the emulator; press the <strong>Home</strong> key
-    to navigate away from that application).</li>
-    <li>Run <code>adb install <em>myproject</em>/bin/&lt;<em>appname</em>&gt;.apk</code> to upload
-        the executable. So, for example, to install the Lunar Lander sample, navigate
-        in the command line to <code><em>&lt;your_sdk_dir&gt;</em>/sample/LunarLander</code> and type <code>../../tools/adb&nbsp;install&nbsp;bin/LunarLander.apk</code></li>
-    <li>In the emulator, open the list of available applications, and scroll down to
-        select and start your application. </li>
+  <li><strong>Create an AVD</strong>
+    <ol>
+      <li>Open a command-line and navigate to your SDK package's 
+      <code>tools/</code> directory.</li>
+      <li>First, you need to select a "deployment target." To view available targets, execute:
+        <pre>android list targets</pre>
+        <p>This will output a list of available Android targets, such as:</p>
+<pre>
+id:1
+    Name: Android 1.1
+    Type: platform
+    API level: 2
+    Skins: HVGA (default), HVGA-L, HVGA-P, QVGA-L, QVGA-P
+id:2
+    Name: Android 1.5
+    Type: platform
+    API level: 3
+    Skins: HVGA (default), HVGA-L, HVGA-P, QVGA-L, QVGA-P
+</pre>
+        <p>Find the target that matches the Android platform upon which you'd like
+        to run your application. Note the integer value of the <code>id</code> &mdash;
+        you'll use this in the next step.</p>
+      </li>
+      <li>Create a new AVD using your selected deployment target:
+        <pre>android create avd --name <em>&lt;your_avd_name&gt;</em> --target <em>&lt;targetID&gt;</em></pre>
+      <li>Next, you'll be asked whether you'd like to create a custom hardware profile.
+      If you respond "yes," you'll be presented with a series of prompts to define various aspects of the
+      device hardware (leave entries blank to use default values, which are shown in brackets). Otherwise,
+      press return to use all default values ("no" is the default).</li>
+      </li>
+    </ol>
+  </li>
+
+  <li><strong>Launch an emulator</strong></li>
+    <p>From your SDK's <code>tools/</code> directory, launch an emulator 
+      using an existing AVD (created above):
+    <pre>emulator -avd <em>&lt;your_avd_name&gt;</em></pre>
+    <p>An instance of the emulator will now launch, running the target and configuration 
+      defined by your AVD.</p>
+  </li>
+  
+  <li><strong>Install your application</strong>
+    <p>From your SDK's <code>tools/</code> directory, install the .apk on the emulator:
+    <pre>adb install <em>/path/to/your/application</em>.apk</pre>
+    <p>If there is more than one emulator running, you must specify the emulator upon which to install
+    the application, by its serial number, with the <code>-s</code> option. For example:</p>
+    <pre>adb -s emulator-5554 install /my/project/path/myapp.apk</pre>
+  </li>
+  <li><strong>Open your application</strong>
+    <p>In the emulator, open the list of available applications to find 
+    and open your application.</p>
+  </li>
 </ol>
-<p class="note"><strong>Note:</strong> When you install an Activity for the
-        first time, you might have to restart the emulator before it shows up in the
-        application launcher, or other applications can call it. This is because
-        the package manager usually only examines manifests completely on emulator
-        startup.</p>
 
-<h2>Attaching a Debugger to Your Application</h2>
+<p>If you don't see your application on the emulator. Try restarting the emulator
+(with the same AVD). Sometimes when you install an Activity for the
+first time, it won't show up in the application launcher or be accessible by other 
+applications. This is because the package manager usually examines manifests 
+completely only on emulator startup.</p>
+
+<p class="note"><strong>Tip:</strong> If you have only one emulator running, 
+you can build your application and install it on the emulator in one simple step. 
+Navigate to the root of your project directory and use Ant to compile the project 
+with <em>install mode</em>:
+<code>ant install</code>. This will build your application, sign it with the debug key, 
+and install it on the currently running emulator.
+If there is more than one emulator currently running
+when using the <code>install</code> command, it will fail &mdash; it can't select between the 
+multiple emulators.</p>
+
+<p>For more information on the tools used above, please see the following documents:</p>
+<ul>
+  <li><a href="{@docRoot}guide/developing/tools/android.html">android Tool</a></li>
+  <li><a href="{@docRoot}guide/developing/tools/emulator.html">Android Emulator</a></li>
+  <li><a href="{@docRoot}guide/developing/tools/adb.html">Android Debug Bridge</a> (ADB)</li>
+</ul>
+
+
+<h2 id="AttachingADebugger">Attaching a Debugger to Your Application</h2>
+
 <p>This section describes how to display debug information on the screen (such
     as CPU usage), as well as how to hook up your IDE to debug running applications
     on the emulator. </p>
 
 <p>Attaching a debugger is automated using the Eclipse plugin,
     but you can configure other IDEs to listen on a debugging port to receive debugging
-    information.</p>
+    information:</p>
 <ol>
-    <li><strong>Start the <a href="{@docRoot}guide/developing/tools/ddms.html">Dalvik Debug Monitor Server (DDMS)
-                tool </a>, </strong> which
+    <li><strong>Start the <a href="{@docRoot}guide/developing/tools/ddms.html">Dalvik Debug Monitor 
+      Server (DDMS)</a> tool, </strong> which
         acts as a port forwarding service between your IDE and the emulator.</li>
     <li><strong>Set 
         optional debugging configurations on
-        your emulator</strong>, such as blocking application startup for an activity
+        your emulator</strong>, such as blocking application startup for an Activity
         until a debugger is attached. Note that many of these debugging options
         can be used without DDMS, such as displaying CPU usage or screen refresh
         rate on the emulator.</li>
-    <li><strong>Configure your IDE to attach to port 8700 for debugging.</strong> We
-        include information on <a href="{@docRoot}guide/developing/debug-tasks.html#ide-debug-port">
-        how to set up Eclipse to debug your project</a>. </li>
-
+    <li><strong>Configure your IDE to attach to port 8700 for debugging.</strong> Read
+        about <a href="{@docRoot}guide/developing/debug-tasks.html#ide-debug-port">
+        Configuring Your IDE to Attach to the Debugging Port</a>. </li>
 </ol>
diff --git a/docs/html/guide/developing/tools/avd.jd b/docs/html/guide/developing/tools/avd.jd
new file mode 100644
index 000000000000..1e13ace551f7
--- /dev/null
+++ b/docs/html/guide/developing/tools/avd.jd
@@ -0,0 +1,500 @@
+page.title=Android Virtual Devices
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+
+  <h2>AVD quickview</h2>
+  <ul>
+    <li>You need to create an AVD to run any app in the Android emulator</li>
+    <li>Each AVD is a completely independent virtual device, with its own
+        hardware options, system image, and data storage.
+    <li>You create AVD configurations to model different device environments 
+        in the Android emulator.</li>
+  </ul>
+  <h2>In this document</h2>
+  <ol>
+    <li><a href="#creating">Creating an AVD</a>
+      <ol>
+        <li><a href="#listingtargets">Listing targets</a></li>
+        <li><a href="#selectingtarget">Selecting a target</a></li>
+        <li><a href="#createavd">Creating the AVD</a></li>
+        <li><a href="#hardwareopts">Setting hardware emulation options</a></li>
+        <li><a href="#location">Default location of the AVD files</a></li>
+      </ol>
+    </li>
+    <li><a href="#managing">Managing AVDs</a>
+      <ol>
+        <li><a href="#moving">Moving an AVD</a></li>
+        <li><a href="#updating">Updating an AVD</a></li>
+        <li><a href="#deleting">Deleting an AVD</a></li>
+      </ol>
+    </li>
+    <li><a href="#options">Command-line options</a></li>
+  </ol>
+  <h2>See Also</h2>
+  <ol>
+    <li><a href="{@docRoot}guide/developing/tools/emulator.html">Android 
+        Emulator</a></li>
+  </ol>
+</div>
+</div>
+
+<p>Android Virtual Devices (AVDs) are configurations of emulator options that let
+you better model an actual device.</p>
+
+<p>Each AVD is made up of: </p>
+
+<ul>
+<li>A hardware profile.&nbsp;&nbsp;You can set options to define the hardware
+features of the virtual device. For example, you can define whether the device
+has a camera, whether it uses a physical QWERTY keyboard or a dialing pad, how
+much memory it has, and so on. </li>
+<li>A mapping to a system image.&nbsp;&nbsp;You can define what version of the
+Android platform will run on the virtual device. You can choose a version of the
+standard Android platform or the system image packaged with an SDK add-on.</li>
+<li>Other options.&nbsp;&nbsp;You can specify the emulator skin you want to use
+with the AVD, which lets you control the screen dimensions, appearance, and so
+on. You can also specify the emulated SD card to use with the AVD.</li>
+<li>A dedicated storage area on your development machine, in which is stored the
+device's user data (installed applications, settings, and so on) and emulated SD
+card.</li>
+</ul>
+
+<p>You can create as many AVDs as you need, based on the types of devices you
+want to model and the Android platforms and external libraries you want to run
+your application on. </p>
+
+<p>In addition to the options in an AVD configuration, you can also
+specify emulator command-line options at launch or by using the emulator
+console to change behaviors or characteristics at run time. For a complete
+reference of emulator options, please see the <a
+href="{@docRoot}/guide/developing/tools/emulator.html">Emulator</a>
+documentation. </p>
+
+<p>To create and manage AVDs, you use the android tool provided in the Android
+SDK. For more information about how to work with AVDs from inside
+your development environment, see <a
+href="{@docRoot}guide/developing/eclipse-adt.html">Developing in Eclipse with
+ADT</a> or <a href="{@docRoot}guide/developing/other-ide.html">Developing in
+Other IDEs</a>, as appropriate for your environment.</p>
+
+<h2 id="creating">Creating an AVD</h2>
+
+<div class="sidebox">The Android SDK does not include any preconfigured AVDs, so
+you need to create an AVD before you can run any application in the emulator
+(even the Hello World application). </div>
+
+<p>To create an AVD, you use the android tool, a command-line utility
+available in the <code>&lt;sdk&gt;/tools/</code> directory. Managing AVDs is one
+of the two main function of the android tool (the other is creating and updating
+Android projects). Open a terminal window and change to the 
+<code>&lt;sdk&gt;/tools/</code> directory, if needed</p>
+
+<p>To create each AVD, you issue the command <code>android avd create</code>,
+with options that specify a name for the new AVD and the system image you want
+to run on the emulator when the AVD is invoked. You can specify other options on
+the command line also, such as to create an emulated SD card for the new AVD, set
+the emulator skin to use, or set a custom location for the AVD's files.</p>
+
+<p>Here's the command-line usage for creating an AVD: </p>
+
+<pre>android -n &lt;name&gt; -t &lt;targetID&gt; [-&lt;option&gt; &lt;value&gt;] ... </pre>
+
+<p>You can use any name you want for the AVD, but since you are likely to be
+creating multiple AVDs, you should choose a name that lets you recognize the
+general characteristics offered by the AVD. </p>
+
+<p>As shown in the usage above, you must use the <code>-t</code> (or
+<code>--target</code>) argument when creating a new AVD. The argument sets up a
+mapping between the AVD and the system image that you want to use whenever the
+AVD is invoked. You can specify any Android system image that is available in
+your local SDK &mdash; it can be the system image of a standard Android platform
+version or that of any SDK add-on. Later, when applications use the AVD, they'll
+be running on the system that you specify in the <code>-t</code> argument.<p>
+
+<p>To specify the system image to use, you refer to its <em>target ID</em>
+&mdash; an integer &mdash; as assigned by the android tool. The target ID is not
+derived from the system image name, version, or API Level, or other attribute,
+so you need to have the android tool list the available system images and the
+target ID of each, as described in the next section. You should do this
+<em>before</em> you run the <code>android create avd</code> command.
+</p>
+
+<h3 id="listingtargets">Listing targets</h3>
+
+<p>To generate a list of system image targets, use this command: </p>
+
+<pre>android list targets</pre>
+
+<p>The android tool scans the <code>&lt;sdk&gt;/platforms</code> and
+<code>&lt;sdk&gt;/add-ons</code> directories looking for valid system images and
+then generates the list of targets. Here's an example of the command output:
+</p>
+
+<pre>Available Android targets:
+id:1
+    Name: Android 1.1
+    Type: platform
+    API level: 2
+    Skins: HVGA (default), HVGA-L, HVGA-P, QVGA-L, QVGA-P
+id:2
+    Name: Android 1.5
+    Type: platform
+    API level: 3
+    Skins: HVGA (default), HVGA-L, HVGA-P, QVGA-L, QVGA-P
+id:3
+    Name: Google APIs
+    Type: add-on
+    Vendor: Google Inc.
+    Description: Android + Google APIs
+    Based on Android 1.5 (API level 3)
+    Libraries:
+    * com.google.android.maps (maps.jar)
+        API for Google Maps
+    Skins: HVGA (default), HVGA-L, QVGA-P, HVGA-P, QVGA-L</pre>
+
+<h3 id="selectingtarget">Selecting a target</h3>
+
+<p>Once you have generated the list of targets available, you can look at the
+characteristics of each system image &mdash; name, API Level, external
+libraries, and so on &mdash; and determine which target is appropriate for the
+new AVD. </p>
+
+<p>Keep these points in mind when you are selecting a system image target for
+your AVD:</p>
+<ul>
+<li>The API Level of the target is important, because your application will not
+be able to run on a system image whose API Level is less than that required by
+your application, as specified in the <code>minSdkVersion</code> attribute of
+the application's manifest file. For more information about the relationship
+between system API Level and application <code>minSdkVersion</code>, see <a
+href="{@docRoot}guide/publishing/versioning.html#minsdkversion">Specifying
+Minimum System API Version</a>.
+<li>Creating at least one AVD that uses a target whose API Level is greater than
+that required by your application is strongly encouraged, because it allows you to
+test the forward-compatibility of your application. Forward-compatibility
+testing ensures that, when users who have downloaded your application receive a
+system update, your application will continue to function normally. </li>
+<li>If your application declares a <code>uses-library</code> element in its
+manifest file, the application can only run on a system image in which that
+external library is present. If you want your application to run on the AVD you
+are creating, check the application's <code>uses-library</code> element and
+select a system image target that includes that library. 
+
+</ul>
+
+<h3 id="createavd">Creating the AVD</h3>
+
+<p>When you've selected the target you want to use and made a note of its ID,
+use the <code>android create avd</code> command to create the AVD, supplying the
+target ID as the <code>-t</code> argument. Here's an example that creates an
+AVD with name "my_android1.5" and target ID "2" (the standard Android 1.5 
+system image in the list above): </p>
+
+<pre>android create avd -n my_android1.5 -t 2</pre>
+
+<p>If the target you selected was a standard Android system image ("Type:
+platform"), the android tool next asks you whether you want to create a custom
+hardware profile. </p>
+
+<pre>Android 1.5 is a basic Android platform.
+Do you wish to create a custom hardware profile [no]</pre>
+
+<p>If you want to set custom hardware emulation options for the AVD, enter
+"yes" and set values as needed. If you want to use the default hardware
+emulation options for the AVD, just press the return key (the default is "no").
+The android tool creates the AVD with name and system image mapping you
+requested, with the options you specified. 
+
+<p class="note">If you are creating an AVD whose target is an SDK add-on,
+the android tool does not allow you to set hardware emulation options. It
+assumes that the provider of the add-on has set emulation options appropriately
+for the device that the add-on is modeling, and so prevents you from resetting
+the options. </p>
+
+<p>For a list of options you can use in the <code>android create avd</code>
+command, see the table in <a href="#options">Command-line options for AVDs</a>,
+at the bottom of
+this page. </p>
+
+<h3 id="hardwareopts">Setting hardware emulation options</h3>
+
+<p>When are creating a new AVD that uses a standard Android system image ("Type:
+platform"), the android tool lets you set hardware emulation options for virtual
+device. The table below lists the options available and the default values, as
+well as the names of properties that store the emulated hardware options in the AVD's
+configuration file (the config.ini file in the AVD's local directory). </p>
+
+
+<table>
+<tr>
+<th>Characteristic</th>
+<th>Description</th>
+<th>Property</th>
+</tr>
+
+<tr>
+<td>Device ram size</td>
+<td>The amount of physical RAM on the device, in megabytes. Default value is "96".
+<td>hw.ramSize</td>
+</tr>
+
+<tr>
+<td>Touch-screen support</td>
+<td>Whether there is a touch screen or not on the device. Default value is "yes".</td>
+<td>hw.touchScreen
+
+
+<tr>
+<td>Trackball support </td>
+<td>Whether there is a trackball on the device. Default value is "yes".</td>
+<td>hw.trackBall</td>
+</tr>
+
+<tr>
+<td>Keyboard support</td>
+<td>Whether the device has a QWERTY keyboard. Default value is "yes".</td>
+<td>hw.keyboard</td>
+</tr>
+
+<tr>
+<td>DPad support</td>
+<td>Whether the device has DPad keys. Default value is "yes".</td>
+<td>hw.dPad</td>
+</tr>
+
+<tr>
+<td>GSM modem support</td>
+<td>Whether there is a GSM modem in the device. Default value is "yes".</td>
+<td>hw.gsmModem</td>
+</tr>
+
+<tr>
+<td>Camera support</td>
+<td>Whether the device has a camera. Default value is "no".</td>
+<td>hw.camera</td>
+</tr>
+
+<tr>
+<td>Maximum horizontal camera pixels</td>
+<td>Default value is "640".</td>
+<td>hw.camera.maxHorizontalPixels</td>
+</tr>
+
+<tr>
+<td>Maximum vertical camera pixels</td>
+<td>Default value is "480".</td>
+<td>hw.camera.maxVerticalPixels</td>
+</tr>
+
+<tr>
+<td>GPS support</td>
+<td>Whether there is a GPS in the device. Default value is "yes".</td>
+<td>hw.gps</td>
+</tr>
+
+<tr>
+<td>Battery support</td>
+<td>Whether the device can run on a battery. Default value is "yes".</td>
+<td>hw.battery</td>
+</tr>
+
+<tr>
+<td>Accelerometer</td>
+<td>Whether there is an accelerometer in the device. Default value is "yes".</td>
+<td>hw.accelerometer</td>
+</tr>
+
+<tr>
+<td>Audio recording support</td>
+<td>Whether the device can record audio. Default value is "yes".</td>
+<td>hw.audioInput</td>
+</tr>
+
+<tr>
+<td>Audio playback support</td>
+<td>Whether the device can play audio. Default value is "yes".</td>
+<td>hw.audioOutput</td>
+</tr>
+
+<tr>
+<td>SD Card support</td>
+<td>Whether the device supports insertion/removal of virtual SD Cards. Default value is "yes".</td>
+<td>hw.sdCard</td>
+</tr>
+
+<tr>
+<td>Cache partition support</td>
+<td>Whether we use a /cache partition on the device. Default value is "yes".</td>
+<td>disk.cachePartition</td>
+</tr>
+
+<tr>
+<td>Cache partition size</td>
+<td>Default value is "66MB".</td>
+<td>disk.cachePartition.size </td>
+</tr>
+</table>
+
+<h3 id="location">Default location of the AVD files</h3>
+
+<p>When you create an AVD, the android tool creates a dedicated directory for it
+on your development computer. The directory contains the AVD configuration file,
+the user data image and SD card image (if available), and any other files
+associated with the device. Note that the directory does not contain a system
+image &mdash; instead, the AVD configuration file contains a mapping to the
+system image, which it loads when the AVD is launched. </p>
+
+<p>The android tool also creates a &lt;AVD name&gt;.ini file for the AVD at the
+root of the .android/avd directory on your computer. The file specifies the
+location of the AVD directory and always remains at the root the .android 
+directory.</p>
+
+<p>By default, the android tool creates the AVD directory inside
+<code>~/.android/avd/</code> (on Linux/Mac), <code>C:\Documents and
+Settings\&lt;user&gt;\.android\</code> on Windows XP, and 
+<code>C:\Users\&lt;user&gt;\.android\</code> on Windows Vista. 
+If you want to use a custom location for the AVD directory, you 
+can do so by using the <code>-p &lt;path&gt;</code> option when 
+you create the AVD: </p>
+
+<pre>android create avd -n my_android1.5 -t 2 -p path/to/my/avd</pre>
+
+<p>If the .android directory is hosted on a network drive, we recommend using
+the <code>-p</code> option to place the AVD directory in another location. 
+The  AVD's .ini file remains in the .android directory on the network
+drive, regardless of the location of the AVD directory. </p>
+
+<h2 id="managing">Managing AVDs</h2>
+
+<p>The sections below provide more information about how to manage AVDs once you've created them. </p>
+
+<h3 id="moving">Moving an AVD</h3>
+
+<p>If you want to move or rename an AVD, you can do so using this command:</p>
+
+<pre>android move avd -n &lt;name&gt; [-&lt;option&gt; &lt;value&gt;] ...</pre>
+
+<p>The options for this command are listed in <a href="#options">Command-line
+options for AVDs</a> at the bottom of this page. </p>
+
+<h3 id="updating">Updating an AVD</h3>
+
+<p>If, for any reason, the platform/add-on root folder has its name changed (maybe because the user has installed an update of the platform/add-on) then the AVD will not be able to load the system image that it is mapped to. In this case, the <code>android list targets</code> command will produce this output: 
+
+<pre>The following Android Virtual Devices could not be loaded: 
+Name: foo 
+Path: &lt;path&gt;/.android/avd/foo.avd 
+Error: Invalid value in image.sysdir. Run 'android update avd -n foo' </pre>
+
+<p>To fix this error, use the <code>android update avd</code> command to recompute the path to the system images.</p>
+
+<h3 id="deleting">Deleting an AVD</h3>
+
+<p>You can use the android tool to delete an AVD. Here is the command usage:</p>
+
+<pre>android delete avd -n &lt;name&gt; </pre>
+
+<p>When you issue the command, the android tool looks for an AVD matching the 
+specified name deletes the AVD's directory and files. </p>
+
+
+<h2 id="options">Command-line options for AVDs</h2>
+
+<p>The table below lists the command-line options you can use with the 
+android tool. </p>
+
+
+<table>
+<tr>
+  <th width="15%">Action</th>
+  <th width="20%">Option</th>
+  <th width="30%">Description</th>
+  <th>Comments</th>
+</tr>
+
+
+<tr>
+  <td><code>list&nbsp;avds</code></td>
+  <td>&nbsp;</td>
+  <td>List all known AVDs, with name, path, target, and skin. </td>
+  <td>&nbsp;</td>
+</tr>
+<tr>
+  <td rowspan="6"><code>create&nbsp;avd</code></td>
+  <td><code>-n &lt;name&gt; or <br></code></td>
+  <td>The name for the AVD.</td>
+  <td>Required</td>
+</tr>
+<tr>
+  <td><code>-t &lt;targetID&gt;</code></td>
+  <td>Target ID of the system image to use with the new AVD.</td>
+  <td>Required. To obtain a list of available targets, use <code>android list
+      targets</code>.</td>
+</tr>
+<tr>
+  <td><code>-c &lt;path&gt;</code> or <br>
+      <code>-c &lt;size&gt;[K|M]</code></td>
+  <td>The path to the SD card image to use with this AVD or the size of a new SD
+      card image to create for this AVD.</td>
+  <td>Examples: <code>-c path/to/sdcard</code> or <code>-c 1000M</code></td>
+</tr>
+<tr>
+  <td><code>-f</code></td>
+  <td>Force creation of the AVD</td>
+  <td>By default, if the name of the AVD being created matches that of an 
+      existing AVD, the android tool will not create the new AVD or overwrite 
+      the existing AVD. If you specify the <code>-f</code> option, however, the 
+      android tool will automatically overwrite any existing AVD that has the 
+      same name as the new AVD. The files and data of the existing AVD are 
+      deleted. </td>
+</tr>
+
+<tr>
+  <td><code>-p &lt;path&gt;</code></td>
+  <td>Path to the location at which to create the directory for this AVD's
+files.</td>
+  <td>&nbsp;</td>
+</tr>
+<tr>
+  <td><code>-s &lt;name&gt;</code> or <br>
+      <code>-s &lt;width&gt;-&lt;height&gt;</code> </td>
+  <td>The skin to use for this AVD, identified by name or dimensions.</td>
+  <td>The android tool scans for a matching skin by name or dimension in the
+<code>skins/</code> directory of the target referenced in the <code>-t
+&lt;targetID&gt;</code> argument. Example: <code>-s HVGA-L</code></td>
+</tr>
+<tr>
+  <td><code>delete&nbsp;avd</code></td>
+  <td><code>-n &lt;name&gt;</code></td>
+  <td>Delete the specified AVD.</td>
+  <td>Required</td>
+</tr>
+<tr>
+  <td rowspan="3"><code>move&nbsp;avd</code></td>
+  <td><code>-n &lt;name&gt;</code></td>
+  <td>The name of the AVD to move.</td>
+  <td>Required</td>
+</tr>
+<tr>
+  <td><code>-p &lt;path&gt;</code></td>
+  <td>The path to the new location for the AVD.</td>
+  <td>&nbsp;</td>
+</tr>
+<tr>
+  <td><code>-r &lt;new-name&gt;</code></td>
+  <td>Rename the AVD.</td>
+  <td>&nbsp;</td>
+</tr>
+<tr>
+  <td><code>update&nbsp;avds</code></td>
+  <td>&nbsp;</td>
+  <td>Recompute the paths to all system images.</td>
+  <td>&nbsp;</td>
+</tr>
+
+
+
+</table>
+
diff --git a/docs/html/guide/developing/tools/emulator.jd b/docs/html/guide/developing/tools/emulator.jd
index 769491b4f14b..11c0da5afa54 100644
--- a/docs/html/guide/developing/tools/emulator.jd
+++ b/docs/html/guide/developing/tools/emulator.jd
@@ -14,30 +14,31 @@ using your mouse or keyboard to generate events for your application. It also
 provides a screen in which your application is displayed, together with any other 
 Android applications running. </p>
 
-<p>To help you model and test your application, the emulator lets your application 
-use the services of the Android platform to invoke other applications, access the 
-network, play audio and video, store and retrieve data, notify the user, and render 
-graphical transitions and themes. </p>
+<p>To let you model and test your application more easily, the emulator supports
+Android Virtual Device (AVD) configurations. AVDs let you specify the Android
+platform that you want to run on the emulator, as well as the hardware options
+and emulator skin files tht you want to use. Once your application is running on
+the emulator, it can use the services of the Android platform to invoke other
+applications, access the network, play audio and video, store and retrieve data,
+notify the user, and render graphical transitions and themes. </p>
 
 <p>The emulator also includes a variety of debug capabilities, such as a console 
 from which you can log kernel output, simulate application interrupts (such as 
 arriving SMS messages or phone calls), and simulate latency effects and dropouts 
 on the data channel.</p>
 
-
-
-
 <div class="inline-toc" style="whitespace:nowrap;">
 <h4>In this document:</h4>
 <div class="g-unit g-first" style="whitespace:nowrap;width:35%;">
 <ol class="toc">
 <li><a href="#overview">Overview</a></li>
 <li><a href="#starting">Starting and Stopping the Emulator</a></li>
+<li><a href="#starting">Android Virtual Devices and the Emulator</a></li>
 <li><a href="#controlling">Controlling the Emulator</a></li>
 <li><a href="#startup-options">Emulator Startup Options</a></li>
 <li><a href="#diskimages">Working with Emulator Disk Images</a>
 	<ol class="toc">
-	<li><a href="#systemimages">System Images</a></li>
+	<li><a href="#defaultimages">Default Images</a></li>
 	<li><a href="#runtimeimages">Runtime Images: User Data and SD Card</a></li>
 	<li><a href="#temporaryimages">Temporary Images</a></li>
 	</ol></li>
@@ -76,7 +77,8 @@ on the data channel.</p>
 <li><a href="#apps">Installing Applications on the Emulator</a></li>
 <li><a href="#sdcard">SD Card Emulation</a>
 	<ol class="toc">
-	<li><a href="#creating">Creating a Disk Image</a></li>
+	<li><a href="#creatinga">Creating an SD card image using the android tool</li>
+	<li><a href="#creatingm">Creating an SD card image using mksdcard</a></li>
 	<li><a href="#copying">Copying Files to a Disk Image</a></li>
 	<li><a href="#loading">Loading the Disk Image at Emulator Startup</a></li>
 	</ol></li>
@@ -92,12 +94,14 @@ on the data channel.</p>
 <h2>Overview</h2>
 
 <p>The Android emulator is a QEMU-based application that provides a virtual ARM
-mobile device on which you can run your Android applications. It provides a full
-Android system stack, down to the kernel level, and includes a set of
+mobile device on which you can run your Android applications. It runs a full
+Android system stack, down to the kernel level, that includes a set of
 preinstalled applications (such as the dialer) that you can access from your
-applications. It provides a skinnable mobile device UI, customizable key
-mappings, and a variety of commands and options for controlling the behaviors of
-the emulated environment.  </p>
+applications. You can choose what version of the Android system you want to 
+run in the emulator by configuring AVDs, and you can also customize the 
+mobile device skin and key mappings. When launching the emulator and at runtime,
+you can use a variety of commands and options to control the its behaviors. 
+</p>
 
 <p>The Android system image distributed in the SDK contains ARM machine code for
 the Android Linux kernel, the native libraries, the Dalvik VM, and the various
@@ -132,9 +136,9 @@ it for developing Android applications.</p>
 <p>During development and testing of your application, you install and run your
 application in the Android emulator. You can launch the emulator as a standalone
 application, from a command line, or you can use it as part of your Eclipse
-development environment. In either case, you can specify the startup options
-described in this document to control the emulator.
- </p>
+development environment. In either case, you specify the AVD configuration to 
+load and any startup options you want to use, as described in this document.
+</p>
 
 <p>You can run your application on a single instance of the emulator or,
 depending on your needs, you can start multiple emulator instances and run your
@@ -146,9 +150,14 @@ Emulation</a>, <a href="#sms">SMS Emulation</a>, and
 <a href="#emulatornetworking">Emulator Networking</a></p>
 
 <p>To start an instance of the emulator from the command line, change to the
-<code>tools/</code> folder of the SDK and enter <code>emulator</code> or
-<code>./emulator</code>. This initializes the Android system and you will see
-the emulator window appear on your screen. </p>
+<code>tools/</code> folder of the SDK. Enter <code>emulator</code> command
+like this: </p>
+
+<pre>emulator -avd &lt;avd_name&gt;</pre> 
+
+<p>This initializes the emulator and loads an AVD configuration (see the next
+section for more information about AVDs). You will see the emulator window
+appear on your screen. </p>
 
 <p>If you are working in Eclipse, the ADT plugin for Eclipse installs your
 application and starts the emulator automatically, when you run or debug 
@@ -163,6 +172,27 @@ on the Emulator</a> for information about how to install your application.</p>
 
 <a name="controlling"></a>
 
+<a name="avds"></a>
+
+<h2>Android Virtual Devices and the Emulator</h2>
+
+<p>To use the emulator, you first must create one or more AVD configurations. In each
+configuration, you specify an Android platform to run in the emulator and the set of hardware 
+options and emulator skin you want to use. Then, when you launch the emulator, you specify
+the AVD configuration that you want to load. </p>
+
+<p>To specify the AVD you want to load when starting the emulator, you use the 
+<code>-avd</code> argument, as shown in the previous section. </p>
+
+<p>Each AVD functions as an independent device, with its own private storage for 
+user data, SD card, and so on. When you launch the emulator with an AVD configuration, 
+it automatically loads the user data and SD card data from the AVD directory. By default,
+the emulator stores the user data, SD card data, and cache in the AVD directory.</p>
+
+<p>To create and manage AVDs you use the android tool, a command-line utility
+included in the SDK. For complete information about how to set up AVDs, see <a
+href="{@docRoot}guide/developing/tools/avd.html">Android Virtual Devices</a>.</p>
+
 <h2>Controlling the Emulator</h2>
 
 <p>You can use emulator <a href="#startup-options">startup options</a> and <a
@@ -279,7 +309,7 @@ the keys of your keyboard. </p>
 when launching the emulator, to control its appearance or behavior. 
 Here's the command-line usage for launching the emulator with options: </p>
 
-<pre>emulator [-&lt;option&gt; [&lt;value&gt;]] ... [-&lt;qemu args&gt;]</pre>
+<pre>emulator -avd &lt;avd_name&gt; [-&lt;option&gt; [&lt;value&gt;]] ... [-&lt;qemu args&gt;]</pre>
 
 <p>The table below summarizes the available options.</p>
 
@@ -292,7 +322,7 @@ Here's the command-line usage for launching the emulator with options: </p>
 </tr>
 
 <tr>
-  <td rowspan="8">Help</td>
+  <td rowspan="9">Help</td>
   <td><code>-help</code></td>
   <td>Print a list of all emulator options.</td>
   <td>&nbsp;</td>
@@ -331,9 +361,22 @@ Here's the command-line usage for launching the emulator with options: </p>
   <td>Print help for defining a custom key mappings file.</td>
   <td>&nbsp;</td>
 </tr>
-
 <tr>
-  <td rowspan="10">Disk Images</td>
+  <td><code>-help-virtual-device</code></td>
+  <td>Print help for Android Virtual Device usage.</td>
+  <td>&nbsp;</td>
+</tr>
+<tr>
+  <td>AVD</td>
+  <td><code>-avd &lt;avd_name&gt;</code> or <br>
+      <code>@&lt;avd_name&gt;</code></td>
+  <td><strong>Required</strong>. Specifies the AVD to load for this emulator
+      instance.</td>
+  <td>You must create an AVD configuration before launching the emulator. For
+      information, see <a href="{@docRoot}guide/developing/tools/avd.html">Android
+      Virtual Devices</a>.</td>
+<tr>
+  <td rowspan="7">Disk Images</td>
   <td><code>-cache&nbsp;&lt;filepath&gt;</code></td>
   <td>Use &lt;filepath&gt; as the working cache partition image. </td>
   <td>Optionally, you can specify a path relative to the current working directory. 
@@ -345,13 +388,7 @@ Here's the command-line usage for launching the emulator with options: </p>
   <td>Use &lt;filepath&gt; as the working user-data disk image. </td>
   <td>Optionally, you can specify a path relative to the current working directory. 
   If <code>-data</code> is not used, the emulator looks for a file named &quot;userdata-qemu.img&quot; 
-  in the directory specified in &lt;datadir&gt;. ~/.android/SDK-1.0 (on Linux/Mac) or 
-  C:\Documents and Settings\&lt;user&gt;\Local Settings\Application Data\Android\SDK-1.0 (on Windows). 
-  <p> If you use <code>-data &lt;filepath&gt;</code> but the file does not exist, the emulator creates 
-  a file at that location using the specified name. </p>
-  <p>See <a href="#multipleinstances">Running Multiple Emulator Instances</a> for information about how 
-  to use <code>-data</code> to let multiple emulator instances preserve their user data across sessions.</p>
-  <p>For more information on disk images, use <code>-help-disk-images</code>.</p>
+  in the storage area of the AVD being used (see <code>-avd</code>). 
 </td></tr>
 <!--
 <tr>
@@ -359,28 +396,32 @@ Here's the command-line usage for launching the emulator with options: </p>
   <td>Search for the user-data disk image specified in <code>-data</code> in &lt;dir&gt;</td>
   <td><code>&lt;dir&gt;</code> is a path relative to the current working directory. 
 
-<p>If you do not specify <code>-datadir</code>, the emulator looks for the user-data image in the 
-  directory ~/.android/SDK-1.0 (on Linux/Mac) or C:\Documents and Settings\&lt;user&gt;\Local Settings\Application 
-  Data\Android\SDK-1.0 (on Windows). </p><p>For more information on disk images, use <code>-help-disk-images</code>.</p>
+<p>If you do not specify <code>-datadir</code>, the emulator looks for the user-data image 
+in the storage area of the AVD being used (see <code>-avd</code>)</p><p>For more information 
+on disk images, use <code>-help-disk-images</code>.</p>
 </td></tr>
 -->
+<!-- 
 <tr>
   <td><code>-image&nbsp;&lt;filepath&gt;</code></td>
   <td>Use &lt;filepath&gt; as the system image.</td>
   <td>Optionally, you can specify a path relative to the current working directory. 
    Default is &lt;system&gt;/system.img.</td>
 </tr>
+-->
 <tr>
   <td><code>-initdata&nbsp;&lt;filepath&gt;</code></td>
   <td>When resetting the user-data image (through <code>-wipe-data</code>), copy the contents 
   of this file to the new user-data disk image. By default, the emulator copies the <code>&lt;system&gt;/userdata.img</code>.</td>
   <td>Optionally, you can specify a path relative to the current working directory. See also <code>-wipe-data</code>. <p>For more information on disk images, use <code>-help-disk-images</code>.</p></td>
 </tr>
+<!--
 <tr>
   <td><code>-kernel&nbsp;&lt;filepath&gt;</code></td>
   <td>Use &lt;filepath&gt; as the emulated kernel.</td>
   <td>Optionally, you can specify a path relative to the current working directory. </td>
 </tr>
+-->
 <tr>
   <td><code>-nocache</code></td>
   <td>Start the emulator without a cache partition.</td>
@@ -400,12 +441,14 @@ Here's the command-line usage for launching the emulator with options: </p>
   <p>Optionally, you can specify a path relative to the current working directory. For more information on disk images, use <code>-help-disk-images</code>.</p>
 </td>
 </tr>
+<!--
 <tr>
  <td><code>-system&nbsp;&lt;dirpath&gt;</code></td>
  <td>Search for system, ramdisk and user data images in &lt;dir&gt;.</td>
  <td><code>&lt;dir&gt;</code> is a directory path relative to the current 
   working directory.</td>
 </tr>
+-->
 <tr>
   <td><code>-wipe-data</code></td>
   <td>Reset the current user-data disk image (that is, the file specified by <code>-datadir</code> and 
@@ -679,7 +722,8 @@ scale in direct relationship with &lt;delay&gt; values.</p>
 <tr>
   <td><code>-skin &lt;skinID&gt;</code></td>
   <td>Start the emulator with the specified skin. </td>
-  <td>The SDK includes a <a href="#skins">choice of four skins</a>:<br />
+  <td>The standard Android platforms includes a <a href="#skins">choice of 
+      four skins</a>:<br />
       <li>HVGA-L (480x320, landscape)</li>
       <li>HVGA-P (320x480, portrait) (default) </li>
       <li>QVGA-L (320x240, landscape)</li>
@@ -702,10 +746,16 @@ disk image containing an emulator-specific kernel, the Android system, a
 ramdisk image, and writeable images for user data and simulated SD card.</p>
 
 <p>To run properly, the emulator requires access to a specific set of disk image
-files. The Android SDK includes default versions of the required images, stored
-in predetermined locations in the SDK directory structure. At startup, the
-emulator looks for and reads the image files, using their default names and
-storage locations. </p>
+files. By default, the Emulator always looks for the disk images in the 
+private storage area of the AVD in use. If no images exist there when 
+the Emulator is launched, it creates the images in the AVD directory based on 
+default versions stored in the SDK. </p>
+
+<p class="note"><strong>Note:</strong> The default storage location for 
+AVDs is in <code>~/.android/avd</code> on OS X and Linux, <code>C:\Documents and 
+Settings\&lt;user&gt;\.android\</code> on Windows XP, and 
+<code>C:\Users\&lt;user&gt;\.android\</code>
+on Windows Vista<code>.</p>
 
 <p>To let you use alternate or custom versions of the image files, the emulator
 provides startup options that override the default locations and filenames of
@@ -713,32 +763,26 @@ the image files. When you use the options, the emulator searches for the image
 file under the image name or location that you specify; if it can not locate the
 image, it reverts to using the default names and location.</p>
 
-<p>The emulator uses three types of image files: system image files, runtime
+<p>The emulator uses three types of image files: default image files, runtime
 image files, and temporary image files. The sections below describe how to
 override the location/name of each type of file. </p>
 
-<a name="systemimages"></a>
-<h3>System Images</h3>
+<a name="defaultimages"></a>
+<h3>Default Images</h3>
 
-<p>System images contain system data and default settings without which the
-emulator can not run. The image files are read-only &mdash; the emulator reads
-the images at startup and does not modify them during the session.</p>
-
-<p>All of the system image files are stored in a single directory. By default,
-the system images are stored in the <code>lib/images</code>' under the
-emulator's program location. </p>
+<p>When the emulator launches but does not find an existing user data image in
+the active AVD's storage area, it creates a new one from a default version
+included in the SDK. The default user data image is read-only. The image 
+files are read-only.</p>
 
 <p>The emulator provides the <code>-system &lt;dir&gt;</code> startup option to
-let you override the location under which the emulator looks for the system
-images files. </p>
+let you override the location under which the emulator looks for the default
+user data image. </p>
 
-<p>The emulator also provides startup options that let you override the names of
-the system images, as described in the table below. When you use one of the 
-options, the emulator looks in the default directory, or in a custom location
-(if you specified <code>-system &lt;dir&gt;</code>). Note that, if you provide
-alternate system image file, it must contain the same type of data as the
-default. For example, your override of the system.img file must point to a disk
-image containing an Android system. </p>
+<p>The emulator also provides a startup option that lets you override the name
+of the default user data image, as described in the table below. When you use the 
+option, the emulator looks in the default directory, or in a custom location
+(if you specified <code>-system &lt;dir&gt;</code>). </p>
 
 
 <table>
@@ -748,6 +792,7 @@ image containing an Android system. </p>
     <th width="40%" >Comments</th>
 </tr>
 
+<!--
 <tr>
   <td><code>kernel-qemu.img</code></td>
   <td>The emulator-specific Linux kernel image</td>
@@ -765,7 +810,7 @@ image containing an Android system. </p>
   <td>The <em>initial</em> Android system image.</td>
   <td>Override using <code>-image &lt;file&gt;</code></td>
 </tr>
-
+-->
 <tr>
   <td><code>userdata.img</code></td>
   <td>The <em>initial</em> user-data disk image</td>
@@ -784,13 +829,7 @@ partition and removable storage media on actual device. </p>
 
 <p>The emulator provides a default user-data disk image. At startup, the emulator 
 creates the default image as a copy of the system user-data image (user-data.img), 
-described above. The emulator stores the default image in this location on 
-on your development machine: </p>
-
-<ul>
-  <li>Linux and OS X: <code>~/.android/SDK-1.0</code></li>
-  <li>Windows: <code>C:\Documents and Settings\&lt;user&gt;\Local Settings\Application Data\Android\SDK-1.0</code></li>
-</ul>
+described above. The emulator stores the new image with the files of the active AVD.</p>
 
 <!--
 <p>The emulator provides a startup option, <code>-datadir &lt;dir&gt;</code>, 
@@ -801,7 +840,7 @@ image files. </p>
 <p>The emulator provides startup options to let you override the actual names and storage 
 locations of the runtime images to load, as described in the table below. When you use one 
 of these options, the emulator looks for the specified file(s) in the current working directory,
-in the default directory, or in a custom location (if you specified a path with the filename. </p>
+in the AVD directory, or in a custom location (if you specified a path with the filename). </p>
 
 <table>
 <tr>
@@ -837,12 +876,12 @@ installed application data, settings, databases, and files. </p>
 
 <p>At startup, the emulator attempts to load a user-data image stored during 
 a previous session. It looks for the file in the current working directory, 
-at the default location, as described above, and at the custom location/name 
+in the AVD directory as described above, and at the custom location/name 
 that you specified at startup. </p>
 
 <ul>
-<li>If it finds a user-data image, it mounts the image and makes it available to the system
-for reading/writing of user data. </li>
+<li>If it finds a user-data image, it mounts the image and makes it available 
+to the system for reading/writing of user data. </li>
 <li>If it does not find one, it creates an image by copying the system user-data
 image (userdata.img), described above. At device power-off, the system persists
 the user data to the image, so that it will be available in the next session. 
@@ -850,13 +889,9 @@ Note that the emulator stores the new disk image at the location/name that you
 specify in <code>-data</code> startup option.</li>
 </ul>
 
-<p>If you are planning to run multiple emulator instances concurrently, note
-that only the first emulator instance can persist user-data, if no explicit
-user-data image file is specified in the startup command. When running multiple
-emulator instances, you must specify a name for the image file to use (or
-create), by using the <code>-data &lt;name&gt;</code> option with a unique
-<code>&lt;name&gt;</code> value. For more information, see
-<a href="#multipleinstances">Running Multiple Emulator Instances</a>.</p>
+<p class="note"><strong>Note:</strong> Because of the AVD configurations used in the emulator,
+each emulator instance now gets its own dedicated storage. There is no need 
+to use the <code>-d</code> option to specify an instance-specific storage area.</p>
 
 <h4>SD Card</h4>
 
@@ -864,6 +899,10 @@ create), by using the <code>-data &lt;name&gt;</code> option with a unique
 to simulate removeable storage in an actual device. For information about how to create an 
 emulated SD card and load it in the emulator, see <a href="#sdcard">SD Card Emulation</a></p>
 
+<p>You can also use the android tool to automatically create an SD Card image
+for you, when creating an AVD. For more information, see <a 
+href="{@docRoot}guide/developing/tools/avd.html#options">Command-line options for AVDs</a>.
+
 <a name="temporaryimages"></a>
 <h3>Temporary Images</h3>
 
@@ -1637,21 +1676,11 @@ kilobits/sec):</p>
 
 <h2>Running Multiple Emulator Instances</h2>
 
-<p>You can run multiple instances of the emulator concurrently, if necessary. Each emulator instance can use a separate user-data image file and a different console port. This lets you manage each instance in isolation. </p>
-
-<p>However, if you will run multiple emulator instances, note that there are limitations on the capability of each instance to maintain its persistent user data &mdash; user settings and installed applications &mdash; across sessions. Specifically:</p>
-
-<ul>
-  <li>By default, only the first-launched emulator instance can preserve user data across sessions. When a session closes, 
-  the emulator stores the user data to a user-data image file &mdash; by default, it stores the data in the file 
-  <code>~/.android/SDK-1.0/userdata-qemu.img </code>(on Linux and Mac) or <code>C:\Documents and Settings\&lt;user&gt;\Local
-   Settings\Application Data\Android\SDK-1.0\userdata-qemu.img</code> (on Windows) in your development computer.</li>
-
-<li>Emulator instances that you start after the first instance (that are running concurrently) can also store user data during a session, but they <em>do not</em> preserve it for the next session, unless you have specified a unique user-data image file in which the data should be stored. </li>
-
-</ul>
-
-<p>To run multiple emulator instances and let each maintain user data across sessions, start the instances with the <code>-data</code> option (see <a href="#startup-options">Startup Options</a>) and supply the path to a user-data file. </p>
+<p>Through the AVDs configurations used by the emulator, you can run multiple
+instances of the emulator concurrently, each with its own AVD configuration and
+storage area for user data, SD card, and so on. You no longer need to use the
+<code>-d</code> option when launching the emulator, to point to an
+instance-specific storage area. </p>
 
 <a name="apps"></a>
 
@@ -1675,19 +1704,43 @@ For more information about the user-data partition and other emulator storage,
 see <a href="#diskimages">Working with Emulator Disk Images</a>.</p>
 
 <a name="sdcard"></a>
+<a name="creating"></a>
 
 <h2>SD Card Emulation</h2>
-<p>You can create a disk image and then load it to the emulator at startup, to simulate the presence of a user's SD card in the device. The sections below describe how to create the disk image, how to copy files to it, and how to load it in the emulator at startup. </p>
 
-<p>Note that you can only load disk image at emulator startup. Similarly, you can not remove a simulated SD card from a running emulator. However, you can browse, send files to, and copy/remove files from a simulated SD card either with adb or the emulator. </p>
+<p>You can create a disk image and then load it to the emulator at startup, to
+simulate the presence of a user's SD card in the device. To do this, you can use
+the android tool to create a new SD card image with a new AVD, or you can use
+the mksdcard utility included in the SDK. </p>
 
-<p>The emulator supports emulated SDHC cards, so you can create an SD card image of any size up to 128 gigabytes.</p>
+<p>The sections below describe how to create an SD card disk image, how to copy
+files to it, and how to load it in the emulator at startup. </p>
 
-<a name="creating"></a>
+<p>Note that you can only load disk image at emulator startup. Similarly, you
+can not remove a simulated SD card from a running emulator. However, you can
+browse, send files to, and copy/remove files from a simulated SD card either
+with adb or the emulator. </p>
+
+<p>The emulator supports emulated SDHC cards, so you can create an SD card image
+of any size up to 128 gigabytes.</p>
+
+<h3 id="creatinga">Creating an SD card image using the android tool</h3>
 
-<h3>Creating  a Disk Image</h3>
+<p>The easiest way to create a new SD card is to use the android tool. When
+creating an AVD, you simply specify the <code>-c</code> option, like this: </p>
 
-<p>You can use the mksdcard tool, included in the SDK, to create a FAT32 disk image that you can load in the emulator at startup. You can access mksdcard in the tools/ directory of the SDK and create a disk image like this: </p>
+<pre>android create avd -n &lt;avd_name&gt; -t &lt;targetID&gt; -c &lt;size&gt;[K|M]</pre>
+
+<p>You can also use the <code>-c</code> option to specify a path to an SD card
+image to use in the new AVD. For more information, see <a
+href="{@docRoot}guide/developing/tools/avd.html">Android Virtual Devices</a>.
+</p>
+
+<h3 id="creatingm">Creating an SD card image using mksdcard</h3>
+
+<p>You can use the mksdcard tool, included in the SDK, to create a FAT32 disk
+image that you can load in the emulator at startup. You can access mksdcard in
+the tools/ directory of the SDK and create a disk image like this: </p>
 
 <pre>mksdcard &lt;size&gt; &lt;file&gt;</pre>
 	
@@ -1700,13 +1753,23 @@ see <a href="#diskimages">Working with Emulator Disk Images</a>.</p>
 <a name="copying"></a>
 <h3>Copying Files to a Disk Image</h3>
 
-<p>Once you have created the disk image, you can copy files to it prior to loading it in the emulator. To copy files, you can mount the image as a loop device and then copy the files to it, or you can use a utility such as mtools to copy the files directly to the image. The mtools package is available for Linux, Mac, and Windows.</p>
+<p>Once you have created the disk image, you can copy files to it prior to
+loading it in the emulator. To copy files, you can mount the image as a loop
+device and then copy the files to it, or you can use a utility such as mtools to
+copy the files directly to the image. The mtools package is available for Linux,
+Mac, and Windows.</p>
 
 <a name="loading"></a>
 <a name="step3" id="step3"></a>
 
 <h3>Loading the Disk Image at Emulator Startup</h3>
-<p>To load FAT32 disk image in the emulator, start the emulator with the <code>-sdcard</code> flag and specify the name and path of your image (relative to the current working directory): </p>
+
+<p>By default, the emulator loads the SD card image that is stored with the active
+AVD (see the <code>-avd</code> startup option).</p>
+
+<p>Alternatively, you ca start the emulator with the
+<code>-sdcard</code> flag and specify the name and path of your image (relative
+to the current working directory): </p>
 
 <pre>emulator -sdcard &lt;filepath&gt;</pre>
 
diff --git a/docs/html/guide/developing/tools/index.jd b/docs/html/guide/developing/tools/index.jd
index b491a4fcd8da..e53d5957995a 100644
--- a/docs/html/guide/developing/tools/index.jd
+++ b/docs/html/guide/developing/tools/index.jd
@@ -8,23 +8,29 @@ applications on the Android platform. The most important of these are the Androi
 Emulator and the Android Development Tools plugin for Eclipse, but the SDK also 
 includes a variety of other tools for debugging, packaging, and installing your 
 applications on the emulator. </p>
-
-<dl>
-    <dt><a href="emulator.html">Android Emulator</a></dt>
-    <dd>A virtual mobile device that runs on your computer. You use the emulator to design, 
-    debug, and test your applications in an actual Android run-time environment. </dd>
     
+ <dl>
   <dt><a href="adt.html">Android Development Tools Plugin</a> (for the Eclipse IDE)</dt>
           <dd>The ADT plugin adds powerful extensions to the Eclipse integrated environment, 
           making creating and debugging your Android applications easier and faster. If you 
           use Eclipse, the ADT plugin gives you an incredible boost in developing Android 
           applications.</dd>
+  <dt><a href="emulator.html">Android Emulator</a></dt>
+    <dd>A QEMU-based device-emulation tool that you can use to design, 
+    debug, and test your applications in an actual Android run-time environment. </dd>
 
-	  <dt><a href="hierarchy-viewer.html">Hierarchy Viewer</a></dt>
-	    <dd>The Hierarchy Viewer tool allows you to debug and optimize your user interface.
-	    It provides a visual representation of your layout's hierarchy of Views and a magnified inspector
-	    of the current display with a pixel grid, so you can get your layout just right.
-	    </dd>
+  <dt><a href="emulator.html">Android Virtual Devices (AVDs)</a></dt>
+    <dd>Virtual device configurations that you create, to model device
+        characteristics in the Android Emulator. In each configuration, you can
+        specify the Android platform to run, the hardware options, and the
+        emulator skin to use. Each AVD functions as an independent device with 
+        it's own storage for user data, SD card, and so on. </dd>
+
+ <dt><a href="hierarchy-viewer.html">Hierarchy Viewer</a></dt>
+    <dd>The Hierarchy Viewer tool allows you to debug and optimize your user interface.
+        It provides a visual representation of your layout's hierarchy of Views and a magnified inspector
+        of the current display with a pixel grid, so you can get your layout just right.
+    </dd>
 
 	  <dt><a href="draw9patch.html">Draw 9-patch</a></dt>
 	    <dd>The Draw 9-patch tool allows you to easily create a 
@@ -79,10 +85,9 @@ applications on the emulator. </p>
       level events.  You can use the Monkey to stress-test applications that you are developing,
       in a random yet repeatable manner.</dd>
 
-  <dt><a  href="othertools.html#activitycreator">activitycreator</a></dt>
-            <dd>A script that generates <a
+  <dt><a  href="othertools.html#android">android</a></dt>
+            <dd>A script that lets you manage AVDs and generate <a
                         href="http://ant.apache.org/" title="Ant">Ant</a> build files that 
-                        you can use to compile your Android applications. If you are developing 
-                        on Eclipse with the ADT plugin, you won't need to use this script. </dd>
+                        you can use to compile your Android applications. </dd>
 </dl>
 
diff --git a/docs/html/guide/developing/tools/othertools.jd b/docs/html/guide/developing/tools/othertools.jd
index eaa0b76a5f42..603609eb1ae0 100644
--- a/docs/html/guide/developing/tools/othertools.jd
+++ b/docs/html/guide/developing/tools/othertools.jd
@@ -3,16 +3,32 @@ page.title=Other Tools
 
 <p>The sections below describe other tools that you can use when building Android applications. </p>
 
-<p>All of the tools are included in the Android SDK and are accessible from the <code>tools/</code> directory.</p>
+<p>All of the tools are included in the Android SDK and are accessible from the <code>&lt;sdk&gt;/tools/</code> directory.</p>
 
 <h2>Contents</h2>
 
 <dl>
+    <dt><a href="#android">android</a></dd>
     <dt><a href="#mksdcard">mksdcard</a></dt>
     <dt><a href="#dx">dx</a></dt>
-    <dt><a href="#activitycreator">activitycreator</a></dd>
 </dl>
 
+<a name="activitycreator"></a>
+<h2 id="android">android</h2>
+
+<p>The android tool is a script that lets you create and manage Android Virtual Devices (AVDs) and, if you are developing using Ant, generate template Android projects to help you get started quickly. </p>
+
+<p>For information about how to use the android tool to manage AVDs, see <a href="{@docRoot}guide/developing/tools/avd.html">Android Virtual Devices</a>. </p>
+
+<p>For information about how to use the android tool to create or update a project, see <a href="{@docRoot}guide/developing/other-ide.html">Developing in Other IDEs</a>. </p>
+
+<p>Note that if you are developing in Eclipse with the ADT plugin, you will use the android tool to manage the AVDs you create, but you will not use the android tool for creating a project. The ADT plugin provides a New Project Wizard that helps you set up an Android project in Eclipse. </p>
+
+<p>If you are developing in Ant, you will use the android tool to manage your AVDs, and you can also use it to create or update a project. </p>
+
+<p class="note">Note: The android tool replaces the activitycreator tool provided in previous SDK releases.</p>
+
+
 <a name="mksdcard"></a>
 
 <h2>mksdcard</h2>
@@ -21,7 +37,7 @@ page.title=Other Tools
 
 <pre>mksdcard [-l label] &lt;size&gt;[K|M] &lt;file&gt;</pre>
 
-</p>The table below lists the available options/arguments</p>
+<p>The table below lists the available options/arguments</p>
 
 <table>
 <tr>
@@ -57,48 +73,6 @@ You can also specify size in kilobytes or megabytes, by appending a "K" or "M" t
 
 <p>The dx tool lets you generate Android bytecode from .class files. The tool converts target files and/or directories to Dalvik executable format (.dex) files, so that they can run in the Android environment. It can also dump the class files in a human-readable format and run a target unit test. You can get the usage and options for this tool by using <code>dx --help</code>.</p>
 
-<a name="activitycreator"></a>
-
-<h2>activitycreator</h2>
-
-<p>If you aren't using the Eclipse IDE and ADT plugin, you can use the the activitycreator script to get started with a new application. When you run the script, it creates the structure of a minimal Android application that you can build on and extend to meet your needs. </p>
-
-<p>For Linux and Mac, the SDK provides <code>activitycreator</code>, a shell script, and for Windows <code>activitycreator.bat</code>, a batch script that runs an executable. Regardless of platform, the usage for the script is the same:</p>
-
-<pre>activitycreator [--out &lt;folder&gt;] [--ide intellij] your.package.name.ActivityName</pre>
-
-<table>
-<tr>
-	<th>Option</th>
-	<th>Description</th>
-</tr>
-
-<tr>
-	<td><code>--out &lt;folder&gt;</code></td>
-	<td>Specifies where to create the files/folders. </td>
-</tr>
-
-<tr>
-	<td><code>--ide intellij</code></td>
-	<td>Creates project files for IntelliJ</td>
-</tr>
-
-</table>
-
-
-<p>When run, the script creates these files: </p>
-
- <ul>
-	<li>AndroidManifest.xml -- The application manifest file.</li>
-	<li>build.xml -- An Ant script to build/package the application.</li>
-	<li>res -- The resource directory.</li>
-	<li>src -- The source directory.</li>
-	<li>src/your/package/name/ActivityName.java -- The Activity class. </li>
-	<li>bin -- The output folder for the compiled .apk (when built by Ant).</li>
-</ul>
-
-<p>When you are ready, you can use Ant to <a href="{@docRoot}guide/developing/other-ide.html#antbuild">build the project</a> so that you can run it on the emulator.</p>
 
-<p>If you are using Eclipse with the ADT plugin, you do not need to use activitycreator. You can use the New Project Wizard, provided by the ADT plugin, instead. </p>
 
 
diff --git a/docs/html/guide/guide_toc.cs b/docs/html/guide/guide_toc.cs
index 77d3522ce72a..3c9b7c27bbcd 100644
--- a/docs/html/guide/guide_toc.cs
+++ b/docs/html/guide/guide_toc.cs
@@ -61,6 +61,7 @@
             <li><a href="<?cs var:toroot ?>guide/topics/manifest/provider-element.html">&lt;provider&gt;</a></li>
             <li><a href="<?cs var:toroot ?>guide/topics/manifest/receiver-element.html">&lt;receiver&gt;</a></li>
             <li><a href="<?cs var:toroot ?>guide/topics/manifest/service-element.html">&lt;service&gt;</a></li>
+            <li><a href="<?cs var:toroot ?>guide/topics/manifest/uses-configuration-element.html">&lt;uses-configuration&gt;</a></li>
             <li><a href="<?cs var:toroot ?>guide/topics/manifest/uses-library-element.html">&lt;uses-library&gt;</a></li>
             <li><a href="<?cs var:toroot ?>guide/topics/manifest/uses-permission-element.html">&lt;uses-permission&gt;</a></li>
             <li><a href="<?cs var:toroot ?>guide/topics/manifest/uses-sdk-element.html">&lt;uses-sdk&gt;</a></li>
@@ -84,7 +85,7 @@
             <li><a style="color:gray;">Accelerometer</a></li>
           </ul>
       </li> -->
-      <li><a href="<?cs var:toroot ?>guide/topics/location/index.html">Location</a></li>
+      <li><a href="<?cs var:toroot ?>guide/topics/location/index.html">Location and Maps</a></li>
 <!--    <li class="toggle-list">
         <div><a style="color:gray;">Wireless Controls</a></div>
           <ul>
@@ -100,7 +101,6 @@
     <ul>
       <!--       <li><a style="color:gray;">Developing for Android</a></li>
       signing, upgrading, selecting a package name, select device profile, touch, trackball, dpad available, etc. -->
-
       <li><a href="<?cs var:toroot ?>guide/developing/eclipse-adt.html">In Eclipse, with ADT</a></li>
       <li><a href="<?cs var:toroot ?>guide/developing/other-ide.html">In Other IDEs</a></li>
       <li><a href="<?cs var:toroot ?>guide/developing/device.html">On a Device</a></li>
@@ -110,9 +110,10 @@
           <ul>
 			<li><a href="<?cs var:toroot ?>guide/developing/tools/aapt.html">aapt</a></li>
 			<li><a href="<?cs var:toroot ?>guide/developing/tools/adb.html">adb</a></li>
-			<li><a href="<?cs var:toroot ?>guide/developing/tools/othertools.html#activitycreator">activitycreator</a></li>
+			<li><a href="<?cs var:toroot ?>guide/developing/tools/othertools.html#android">android</a></li>
 <!--			<li><a href="<?cs var:toroot ?>guide/developing/tools/adt.html">ADT Plugin</a></li>-->
 			<li><a href="<?cs var:toroot ?>guide/developing/tools/aidl.html" >aidl</a></li>
+			<li><a href="<?cs var:toroot ?>guide/developing/tools/avd.html" >AVDs</a></li>
 			<li><a href="<?cs var:toroot ?>guide/developing/tools/ddms.html" >ddms</a></li>
 			<li><a href="<?cs var:toroot ?>guide/developing/tools/othertools.html#dx">dx</a></li>
 			<li><a href="<?cs var:toroot ?>guide/developing/tools/draw9patch.html">Draw 9-Patch</a></li>
diff --git a/docs/html/guide/publishing/app-signing.jd b/docs/html/guide/publishing/app-signing.jd
index 28c927aed29c..a16c9106ad93 100644
--- a/docs/html/guide/publishing/app-signing.jd
+++ b/docs/html/guide/publishing/app-signing.jd
@@ -22,9 +22,10 @@ page.title=Signing Your Applications
 <li><a href="#debugmode">Signing in Debug Mode</a></li>
 <li><a href="#releasemode">Signing for Public Release</a>
     <ol>
-    <li><a href="#releasecompile">Compiling for Release</a></li>
-    <li><a href="#cert">Obtaining a Suitable Private Key</a></li>
-    <li><a href="#signapp">Signing Your Application</a></li>
+    <li><a href="#releasecompile">Compiling for release</a></li>
+    <li><a href="#cert">Obtaining a suitable private key</a></li>
+    <li><a href="#signapp">Signing your application</a></li>
+    <li><a href="#ExportWizard">Compiling and signing with Eclipse ADT</a></li>
     </ol>
 </li>
 <li><a href="#secure-key">Securing Your Private Key</a></li>
@@ -47,9 +48,9 @@ page.title=Signing Your Applications
 
 <p>The Android system requires that all installed applications be digitally
 signed with a certificate whose private key is held by the application's
-developer. The system uses the certificate as a means of identifying the author of
-an application and establishing trust relationships between applications, rather
-than for controlling which applications the user can install. The certificate
+developer. The Android system uses the certificate as a means of identifying the author of
+an application and establishing trust relationships between applications. The certificate is not
+used to control which applications the user can install. The certificate
 does not need to be signed by a certificate authority: it is perfectly
 allowable, and typical, for Android applications to use self-signed
 certificates.</p>
@@ -61,8 +62,8 @@ certificates.</p>
 that is not signed.</li>
   <li>You can use self-signed certificates to sign your applications. No certificate authority 
 is needed.</li>
-  <li>When you are ready to publish your application, you must sign it with a suitable private 
-key. You can not publish an application that is signed with the default key generated 
+  <li>When you are ready to release your application for end-users, you must sign it with a suitable private 
+key. You can not publish an application that is signed with the debug key generated 
 by the SDK tools. 
   </li>
   <li>The system tests a signer certificate's expiration date only at install time. If an 
@@ -78,20 +79,32 @@ For this reason, you must set up signing for your application before you will be
 run or debug it on an emulator or device.</p>
 
 <p>The Android SDK tools assist you in signing your applications when debugging. Both the ADT Plugin 
-for Eclipse and the Ant build tool offer two signing modes &mdash; debug mode and release mode. 
+for Eclipse and the Ant build tool offer two signing modes &mdash; <em>debug mode</em> 
+and <em>release mode</em>. 
 
 <ul>
-<li>In debug mode, the build tools use the Keytool utility, included in the JDK, to create 
+<li>While developing and testing, you can compile in debug mode. 
+In debug mode, the build tools use the Keytool utility, included in the JDK, to create 
 a keystore and key with a known alias and password. At each compilation, the tools then use 
 the debug key to sign the application .apk file. Because the password is known, the tools 
 don't need to prompt you for the keystore/key password each time you compile.</li>
 
-<li>When your application is ready for release, you compile it in release signing mode. 
-In this mode, the tools compile your .apk <em>without</em> signing it. You must then sign
-the .apk manually &mdash; <span style="color:red">with your private key</span> &mdash; 
-using Jarsigner (or similar tool). If you do not have a suitable private key already, 
-you can run Keytool manually to generate your own keystore/key and then sign your 
-application with Jarsigner.</li>
+<li>When your application is ready for release, you must compile in release mode
+and then sign the .apk <span style="color:red">with your private key</span>. 
+There are two ways to do this:
+  <ul>
+    <li>Using Keytool and Jarsigner in the command-line. In this approach,
+    you first compile your application to an <em>unsigned</em> .apk. You must then sign
+    the .apk manually with your private key
+    using Jarsigner (or similar tool). If you do not have a suitable private key already, 
+    you can run Keytool manually to generate your own keystore/key and then sign your 
+    application with Jarsigner.</li>
+    <li>Using the ADT Export Wizard. If you are developing in Eclipse with the ADT plugin, 
+    you can use the Export Wizard to compile the application, generate a private key 
+    (if necessary), and sign the .apk, all in a single process using the Export Wizard.
+    </li>
+  </ul>
+</li>
 </ul>
 
 <h2 id="strategies">Signing Strategies</h2>
@@ -105,7 +118,7 @@ all of your applications with the same certificate, throughout the expected
 lifespan of your applications. There are several reasons why you should do so: </p>
 
 <ul>
-<li>Application upgrade &mdash; As you release upgrades to your
+<li>Application upgrade &ndash; As you release upgrades to your
 application, you will want to sign the upgrades with the same certificate, if you
 want users to upgrade seamlessly to the new version. When the system is 
 installing an update to an application, if any of the certificates in the 
@@ -115,13 +128,13 @@ certificate, you will also need to assign a different package name to the
 application &mdash; in this case, the user installs the new version as a 
 completely new application. </li>
 
-<li>Application modularity &mdash; The Android system allows applications that
+<li>Application modularity &ndash; The Android system allows applications that
 are signed by the same certificate to run in the same process, if the
-applications so request, so that the system treats them as a single application.
+applications so requests, so that the system treats them as a single application.
 In this way you can deploy your application in modules, and users can update
 each of the modules independently if needed.</li>
 
-<li>Code/data sharing through permissions &mdash; The Android system provides
+<li>Code/data sharing through permissions &ndash; The Android system provides
 signature-based permissions enforcement, so that an application can expose
 functionality to another application that is signed with a specified
 certificate. By signing multiple applications with the same certificate and
@@ -167,7 +180,7 @@ Alternatively, you can add the JDK version of Keytool to your PATH variable.</p>
 <p>If you are developing on a version of Linux that originally came with GNU Compiler for 
 Java, make sure that the system is using the JDK version of Keytool, rather than the gcj 
 version. If Keytool is already in your PATH, it might be pointing to a symlink at 
-/usr/bin/keytool. In this case, check the symlink target to make sure that it points 
+<code>/usr/bin/keytool</code>. In this case, check the symlink target to make sure that it points 
 to the Keytool in the JDK.</p>
 
 <p>If you will release your application to the public, you will also need to have
@@ -180,38 +193,46 @@ in the JDK. </p>
 to develop and debug your application, while still meeting the Android system
 requirement for signing your .apk when it is installed in the emulator or a device. 
 When you use debug mode, the SDK tools invoke Keytool to create a debug 
-keystore and key. </p>
+keystore and key.</p>
 
 <p>The SDK tools create the debug keystore/key with predetermined names/passwords;</p>
 <ul>
-<li>Keystore name &mdash; "debug.keystore"</li>
-<li>Keystore password &mdash; "android"</li>
-<li>Key alias &mdash; "androiddebugkey"</li>
-<li>Key password &mdash; "android"</li>
-<li>CN &mdash; "CN=Android Debug,O=Android,C=US"</li>
+<li>Keystore name &ndash; "debug.keystore"</li>
+<li>Keystore password &ndash; "android"</li>
+<li>Key alias &ndash; "androiddebugkey"</li>
+<li>Key password &ndash; "android"</li>
+<li>CN &ndash; "CN=Android Debug,O=Android,C=US"</li>
 </ul></p>
 
+<p>If necessary, you can change the location/name of the debug keystore/key or
+supply a custom debug keystore/key to use. In Eclipse/ADT, you can use
+<strong>Windows</strong> &gt; <strong>Prefs</strong> &gt;
+<strong>Android</strong> &gt; <strong>Build</strong>. However, any custom debug
+keystore/key must use the same keystore/key names and passwords as the default
+debug key (as described above).</p>
+
+<p class="note"><strong>Note:</strong> You <em>cannot</em> release your application 
+to the public when signed with the debug certificate.</p>
+
+<h3>Eclipse Users</h3>
+
 <p>If you are developing in Eclipse/ADT and have set up Keytool as described
 above, signing in debug mode is enabled by default. When you run or debug your
 application, ADT signs the .apk with the debug certificate and installs it on 
 the emulator. No specific action on your part is needed, provided ADT has 
 access to Keytool.</p>
 
+<h3>Ant Users</h3>
+
 <p>If you use Ant to build your .apk files, debug signing mode 
-is enabled by default, assuming that you are using a build.xml file generated by the 
-activitycreator tool included in the latest SDK. When you run Ant against build.xml to 
+is enabled by using the <code>debug</code> option, assuming that you are using a 
+<code>build.xml</code> file generated by the 
+<code>android</code> tool. When you run <code>ant debug</code> to 
 compile your app, the build script generates a keystore/key and signs the .apk for you. 
-No specific action on your part is needed.</p>
-
-<p>If necessary, you can change the location/name of the debug keystore/key or
-supply a custom debug keystore/key to use. In Eclipse/ADT, you can use
-<strong>Windows</strong> &gt; <strong>Prefs</strong> &gt;
-<strong>Android</strong> &gt; <strong>Build</strong>. However, any custom debug
-keystore/key must use the same keystore/key names and passwords as the default
-debug key (as described above). </p>
+No other action on your part is needed. Read 
+<a href="{@docRoot}guide/developing/other-ide.html#DebugMode">Developing In Other IDEs: Building 
+in debug mode</a> for more information.</p>
 
-<p>Note that you <em>cannot</em> release your application to the public if it 
-is signed with the debug certificate. </p>
 
 <h3 id="debugexpiry">Expiry of the Debug Certificate</h3>
 
@@ -227,11 +248,11 @@ looks like this:</p>
 
 <p>In Eclipse/ADT, you will see a similar error in the Android console.</p>
 
-<p>To fix this problem, simply delete the <code>debug.keystore</code> file. On Linux/Mac OSX, 
-the file is stored in <code>~/.android</code>. On Windows XP, the file is stored in <code>
-C:\Documents and Settings\&lt;user&gt;\Local Settings\Application Data\Android</code>. 
-On Windows Vista, the file is stored in <code>
-C:\Users\&lt;user&gt;\AppData\Local\Android</code>.</p>
+<p>To fix this problem, simply delete the <code>debug.keystore</code> file. 
+The default storage location for AVDs is in <code>~/.android/avd</code> on OS X and Linux, 
+in <code>C:\Documents and Settings\<user>\.android\</code> on Windows XP, and in
+<code>C:\Users\<user>\.android\</code> on Windows Vista.</p>
+
 
 <p>The next time you build, the build tools will regenerate a new keystore and debug key.</p>
 
@@ -242,29 +263,45 @@ troubleshooting topic <a href="{@docRoot}guide/appendix/faq/troubleshooting.html
 I&nbsp;can't&nbsp;compile my app because the build tools generated an expired debug 
 certificate</a>. </p>
 
+
 <h2 id="releasemode">Signing for Public Release</h2>
 
 <p>When your application is ready for release to other users, you must:</p>
 <ol>
-<li>Compile the application in release mode</li>
-<li>Obtain a suitable private key, and then</li>
-<li>Sign the application with your private key</li>
-<li>Secure your private key</li>
+  <li>Compile the application in release mode</li>
+  <li>Obtain a suitable private key</li>
+  <li>Sign the application with your private key</li>
 </ol>
 
-<p>The sections below provide information about these steps. </p>
+<p>The sections below provide information about how to perform these steps.</p>
+
+<p>If you use Eclipse with the ADT plugin, you can instead use the Export Wizard
+to compile and sign an .apk with your private key. The Export Wizard even allows you to 
+generate a new keystore and private key in the process. Skip to
+<a href="#ExportWizard">Compiling and signing with Eclipse ADT</a>.</p>
+
 
-<h3 id="releasecompile">Compiling for Release</h3>
+<h3 id="releasecompile">Compiling for release</h3>
 
 <p>To prepare your application for release, you must first compile it in release mode. 
 In release mode, the Android build tools compile your application as usual, 
-but without signing it with the debug key.  </p>
+but without signing it with the debug key.</p>
+
+<p class="warning"><strong>Note:</strong>
+You can not release your application unsigned, or signed with the debug key.</p>
+
+<h4>Eclipse users</h4>
+
+<p>To export an <em>unsigned</em> .apk from Eclipse, right-click the project in the Package 
+Explorer and select <strong>Android Tools</strong> > <strong>Export Unsigned Application 
+Package</strong>. Then simply specify the file location for the unsigned .apk.
+(Alternatively, open your <code>AndroidManifest.xml</code> file in Eclipse, open 
+the <em>Overview</em> tab, and click <strong>Export an unsigned .apk</strong>.)</p>
+
+<p>You can also combine the compiling and signing steps with the Export Wizard. See 
+<a href="#ExportWizard">Compiling and signing with Eclipse ADT</a>.</p>
 
-<p>If you are developing in Eclipse/ADT, right-click the project in the Package 
-pane and select <strong>Android Tools</strong> > <strong>Export Application 
-Package</strong>. You can then specify the file location for the unsigned .apk. 
-Alternatively, you can follow the "Exporting the unsigned .apk" 
-link in the Manifest Editor overview page. </p>
+<h4>Ant users</h4>
 
 <p>If you are using Ant, all you need to do is specify the build target 
 "release" in the Ant command. For example, if you are running Ant from the 
@@ -272,9 +309,8 @@ directory containing your build.xml file, the command would look like this:</p>
 
 <pre>$ ant release</pre>
 
-<p>The build script compiles the application .apk without signing it. 
+<p>The build script compiles the application .apk without signing it.</p>
 
-<p>Note that you can not release your application unsigned, or signed with the debug key.</p>
 
 <h3 id="cert">Obtaining a Suitable Private Key</h3>
 
@@ -303,7 +339,7 @@ in <a href="#setup">Basic Setup</a>.</p>
 command and pass any of the options listed below (and any others, as
 needed). </p>
 
-<p class="warning">Before you run Keytool, make sure to read 
+<p class="warning"><strong>Note:</strong> Before you run Keytool, make sure to read 
 <a href="#secure-key">Securing Your Private Key</a> for a discussion of how to keep
 your key secure and why doing so is critically important to you and to users. In
 particular, when you are generating your key, you should select strong passwords
@@ -378,7 +414,8 @@ will use later, to refer to this keystore when signing your application. </p>
 href="http://java.sun.com/j2se/1.5.0/docs/tooldocs/#security">
 http://java.sun.com/j2se/1.5.0/docs/tooldocs/#security</a></p>
 
-<h3 id="signapp">Signing Your Application</h3>
+
+<h3 id="signapp">Signing your application</h3>
 
 <p>When you are ready to actually sign your .apk for release, you can do so
 using the Jarsigner tool. Make sure that you have Jarsigner available on your
@@ -425,9 +462,9 @@ way, your password is not stored in your shell history.</p></td>
 my_application.apk alias_name</pre>
 
 <p>Running the example command above, Jarsigner prompts you to provide
-passwords for the keystore and key. It then modifies the APK 
+passwords for the keystore and key. It then modifies the .apk 
 in-place, meaning the .apk is now signed. Note that you can sign an 
-APK multiple times with different keys.</p>
+.apk multiple times with different keys.</p>
 
 <p>To verify that your .apk is signed, you can use a command like this:</p>
 
@@ -445,7 +482,7 @@ If you want more details, you can try one of these commands:</p>
 <p>The command above, with the <code>-certs</code> option added, will show you the 
 "CN=" line that describes who created the key.</p>
 
-<p class="note">Note: if you see "CN=Android Debug", this means the .apk was
+<p class="note"><strong>Note:</strong> If you see "CN=Android Debug", this means the .apk was
 signed with the debug key generated by the Android SDK. If you intend to release
 your application, you must sign it with your private key instead of the debug
 key.</p>
@@ -454,6 +491,32 @@ key.</p>
 <a href="http://java.sun.com/j2se/1.5.0/docs/tooldocs/#security">
 http://java.sun.com/j2se/1.5.0/docs/tooldocs/#security</a></p>
 
+
+<h3 id="ExportWizard">Compiling and signing with Eclipse ADT</h3>
+
+<p>When using Eclipse with ADT, you can use the Export Wizard to
+export a <em>signed</em> .apk (and even create a new keystore,
+if necessary). The Export Wizard performs all the interaction with
+the Keytool and Jarsigner for you, which allows you to perform signing via a
+graphical interface instead of the command-line.
+Because the Export Wizard uses both Keytool and Jarsigner, you should
+ensure that they are accessible on your computer, as described above
+in the <a href=#setup">Basic Setup for Signing</a>.</p>
+
+<p>To create a signed .apk, right-click the project in the Package 
+Explorer and select <strong>Android Tools > Export Signed Application Package</strong>.
+(Alternatively, open your <code>AndroidManifest.xml</code> file in Eclipse, open 
+the <em>Overview</em> tab, and click <strong>Use the Export Wizard</strong>.)
+The window that appears will display any errors found while 
+attempting to export your application. If no errors are found, continue with the
+Export Wizard, which will guide you through the process of signing your application,
+including steps for selecting the private key with which to sign the .apk,
+or creating a new keystore and private key.</p>
+
+<p>When you complete the Export Wizard, you'll
+have a signed .apk that's ready for distribution.</p>
+
+
 <h2 id="secure-key">Securing Your Private Key</h2>
 
 <p>Maintaining the security of your private key is of critical importance, both
diff --git a/docs/html/guide/topics/location/geo/mapkey.jd b/docs/html/guide/topics/location/geo/mapkey.jd
deleted file mode 100644
index 9aa824c1d61b..000000000000
--- a/docs/html/guide/topics/location/geo/mapkey.jd
+++ /dev/null
@@ -1,210 +0,0 @@
-page.title=Obtaining a Maps API Key
-@jd:body
-
-<div class="sidebox"><p>To register for a Maps API Key, read this document and then go to the <a href="http://code.google.com/android/maps-api-signup.html">Android Maps API Key Signup</a> page.</p>
-
-</div>
-
-<p>com.google.android.maps.MapView is a very useful class that lets you easily integrate Google Maps into your application. It provides built-in map downloading, rendering, and caching of Maps tiles, as well as a variety of display options and controls. It provides a wrapper around the Google Maps API that lets your application request and manipulate Google Maps data through class methods, and it lets you work with Maps data as you would other types of Views. </p>
-
-<p>Because MapView gives you access to Google Maps data, you need to register with the Google Maps service and agree to the applicable Terms of Service before your MapView will be able to obtain data from Google Maps. This will apply whether you are developing your application on the emulator or preparing your application for deployment to mobile devices. </p>
-
-<p>Registering for a Maps API Key is simple, free, and has two parts: </p>
-
-<ol>
-<li>Registering the MD5 fingerprint of the certificate that you will use to sign your application. The Maps registration service then provides you a Maps API Key that is associated with your application's signer certificate. </li>
-<li>Adding a reference to the Maps API Key in each MapView, whether declared in XML or instantiated directly from code. You can use the same Maps API Key for any MapView in any Android application, provided that the application is signed with the certificate whose fingerprint you registered with the service. </li>
-</ol>
-
-<p>During registration, you also need to agree to the Maps API Terms of Service, which describe how your application can use the Maps data. In general, the terms of service are permissive and place few restrictions on how you can use the data. For example, the terms allow you to build "friend finder" type applications. </p>
-
-<p>The sections below describe how to obtain your Maps API Key and how to reference it from your MapView elements. </p>
-
-<ul>
-<li><a href="#overview">Overview</a></li>
-<li><a href="#getfingerprint">Getting the MD5 Fingerprint of Your Signing Certificate</a></li>
-<li><a href="#getdebugfingerprint">Getting the MD5 Fingerprint of the SDK Debug Certificate</a></li>
-<li><a href="#registering">Registering the Certificate Fingerprint with the Google Maps Service</a></li>
-<li><a href="#addingkey">Adding the Maps API Key to your Application</a></li>
-<li><a href="#finalsteps">Final Steps to Enable MapView Elements</a></li>
-</ul>
-
-<h2 id="overview">Overview</h2>
-
-<p>MapView objects are views that display Maps tiles downloaded from the Google Maps service. To ensure that applications use Maps data in an appropriate manner, the Google Maps service requires application developers to register with the service, agreeing to the Terms of Service and supplying an MD5 fingerprint of the certificate(s) that they will use to sign applications. For each registered certificate fingerprint, the service then provides the developer with a Maps API Key &mdash; an alphanumeric string that uniquely identifies the certificate and developer registered with the service.  </p>
-
-<p>The Google Maps service also requires that each MapView identify itself to the service using a Maps API Key. Before providing Maps tiles to a MapView, the service checks the Maps API Key supplied by the MapView to ensure that it:</p>
-<ul>
-<li>References a certificate/developer registered with the service, and </li>
-<li>References a certificate that matches the certificate with which the application (containing the MapView) was signed. </li>
-</ul>
-
-<p>Unless both conditions are met, the service does not provide Maps tiles to the MapView. </p>
-
-<p>Each MapView object in your application must reference a Maps API Key. Since the Key is associated with a certificate, all Mapview elements in an application should reference the same Key. Going a step further, all MapView elements in all applications that you sign with the same certificate should reference the same Key. </p>
-
-<p>On the other hand, you can register for multiple Maps API Keys, each being associated with a specific certificate. You would want to do this if, for example, you were developing several independent applications that you will sign using different certificates. In this case, note that all MapView elements in a given application can reference the same Maps API Key, but <em>must</em> reference the Key that is associated with the certificate used to sign the application. </p>
-
-<p>Because MapView elements must refer to a Maps API Key, you need to register your certificate and receive a Key before you can make use of MapView elements in your application. To make it easier for you to get started using MapView elements, you are welcome to register the debug certificate generated by the SDK tools and receive a temporary Maps API Key. The details of how to do that are given below. </p>
-
-<p>When you are preparing to release your application, however, note that you <em>must</em> sign your application with a suitable cryptographic key, rather than the SDK debug key. That means that you will also need to register your application's release certificate with the Google Maps service. After you've done so, you will receive a new Maps API Key that is uniquely associated with your release certificate. To enable the MapView elements in your application to work after release, you must remember to change the Maps API Key for all MapViews in your application so that they refer to the Key associated with your release certificate (rather than your debug certificate). </p>
-
-<p>To summarize, the important points to understand about MapViews and the Maps API Key are: </p>
-
-<ul>
-<li>To display Maps data in a MapView, you need to register for a Maps API Key</li>
-<li>Each Maps API Key is uniquely associated with a specific certificate, based on an MD5 fingerprint of the certificate </li>
-<li>Each MapView must reference a Maps API Key, and the Key referenced must be registered to the certificate used to sign the application</li>
-<li>All MapView elements in an application can reference the same Maps API Key</li>
-<li>You can register multiple certificates under your developer identity</li>
-<li>You can get a temporary Maps API Key based on your debug certificate, but before you publish your application, you must register for a new Key based on your release certificate and update references in your MapViews accordingly</li>
-</ul>
-
-<h2 id="getfingerprint">Getting the MD5 Fingerprint of Your Signing Certificate</h2>
-
-<div class="sidebox">
-For more information about using Keytool and Jarsigner to sign your application, see <a href="{@docRoot}guide/publishing/app-signing.html">Signing Your Applications</a>.
-</div>
-
-<p>To register for a Maps API Key, you need to provide an MD5 fingerprint of the certificate that you will use to sign your application. </p>
-
-<p>Before you visit the registration page, use Keytool to generate the fingerprint of the appropriate certificate. 
-
-<p>First, determine which key you will use to sign your application at release and make sure of the path to the keystore that contains it.</p>
-
-<p>Next, run Keytool with the <code>-list</code> option, against the target keystore and key alias. The table below lists the options you should use.</p>
-
-<table>
-<tr>
-<th>Keytool Option</th>
-<th>Description</th>
-</tr>
-<tr>
-<td><code>-list</code></td><td>Print an MD5 fingerprint of a certificate.</td>
-</tr>
-<tr>
-<td><code>-keystore&nbsp;&lt;keystore-name&gt;.keystore</code></td><td>The name of the keystore containing the target key.</td>
-</tr>
-<tr>
-<td><code>-storepass &lt;password&gt;</code></td><td><p>A password for the
-keystore.</p><p>As a security precaution, do not include this option 
-in your command line unless you are working at a secure computer.
-If not supplied, Keytool prompts you to enter the password. In this 
-way, your password is not stored in your shell history.</p></td>
-</tr>
-<tr>
-<td><code>-alias &lt;alias_name&gt;</code></td><td>The alias for the key for which to generate the MD5 certificate fingerprint.</td>
-</tr>
-<tr>
-<td><code>-keypass &lt;password&gt;</code></td><td><p>The password for the key.</p>
-<p>As a security precaution, do not include this option 
-in your command line unless you are working at a secure computer.
-If not supplied, Keytool prompts you to enter the password. In this 
-way, your password is not stored in your shell history.</p></td>
-</tr>
-</table>
-
-<p>Here's an example of a Keytool command that generates an MD5 certificate fingerprint for the key <code>alias_name</code> in the keystore <code>my-release-key.keystore</code>:</p>
-
-<pre>$ keytool -list -alias alias_name -keystore my-release-key.keystore</pre>
-
-<p>Keytool will prompt you to enter passwords for the keystore and key. As output of the command, Keytool prints the fingerprint to the shell. For example:</p>
-
-<pre>Certificate fingerprint (MD5): 94:1E:43:49:87:73:BB:E6:A6:88:D7:20:F1:8E:B5:98</pre>
-
-<p>Note that, if you happen to forget your Maps API Key, you can repeat the process described above and register the fingerprint again. The server will give you the same key for the specified certificate fingerprint.</p>
-
-<p>Once you have the fingerprint, you can go to the Maps API registration site, described next.</p>
-
-<h2 id="getdebugfingerprint">Getting the MD5 Fingerprint of the SDK Debug Certificate</h2>
-
-<p>While you are developing and debugging your application, you will likely be
-sigining your application in debug mode &mdash; that is, the SDK build tools
-will automatically sign your application using the debug certificate. To let
-your MapView elements properly display Maps data during this period, you should
-obtain a temporary Maps API Key registered to the debug certificate. To do so,
-you first need to get the MD5 fingerprint of the debug certificate. When
-you are ready to release your application, you must register your release
-certificate with the Google Maps service and obtain a new Maps API Key. You must
-then change the MapView elements in your application to reference the new API
-key. </p>
-
-<p>To generate an MD5 fingerprint of the debug certificate, first locate the debug keystore. The location at which the SDK tools create the default debug keystore varies by platform: </p>
-
-<ul>
-<li>Windows Vista: <code>C:\Users\&lt;user&gt;\AppData\Local\Android\debug.keystore</code></li>
-<li>Windows XP: <code>C:\Documents and Settings\&lt;user&gt;\Local Settings\Application&nbsp;Data\Android\debug.keystore</code></li>
-<li>OS X and Linux: <code>~/.android/debug.keystore</code></li>
-</ul>
-
-<p>If you are using Eclipse/ADT and are unsure where the debug keystore is located, you can select <strong>Windows</strong> &gt; <strong>Prefs</strong> &gt; <strong>Android</strong> &gt; <strong>Build</strong> to check the full path, which you can then paste into a file explorer to locate the directory containing the keystore.</p>
-
-<p>Once you have located the keystore, use this Keytool command to get the MD5 fingerprint of the debug certificate:</p>
-
-<pre>$ keytool -list -alias androiddebugkey \
--keystore &lt;path_to_debug_keystore&gt;.keystore \
--storepass android -keypass android</pre>
-
-<h2 id="registering">Registering the Certificate Fingerprint with the Google Maps Service</h2>
-
-<p>When you are ready to register for a Maps API Key, load this page in a browser: </p>
-
-<p><a href="http://code.google.com/android/maps-api-signup.html">http://code.google.com/android/maps-api-signup.html</a></p>
-
-<p>To register for a Maps API Key, follow these steps:</p>
-
-<ol>
-<li>If you don't have a Google account, use the link on the page to set one up. </li>
-<li>Read the Android Maps API Terms of Service carefully. If you agree to the terms, indicate so using the checkbox on the screen. </li>
-<li>Paste the MD5 certificate fingerprint of the certificate that you are registering into the appropriate form field.</li>
-<li>Click "Generate API Key"</li>
-</ol>
-
-<p>The server will handle your request, associating the fingerprint with your developer identity and generating a unique Maps API Key, then returning a results page that gives you your Key string. </p>
-
-<p>To use the Maps API Key string, copy and paste it into your code as described in the next section.</p>
-
-<h2 id="addingkey">Adding the Maps API Key to your Application</h2>
-
-<p>Once you've registered with the Google Maps service and have obtained a Maps API Key, you must add it to your application's MapView objects, so that the Maps server will allow them to download Maps tiles. </p>
-
-<p>For <code>&lt;MapView&gt;</code> elements declared in XML layout files, add the Maps API Key as the value of a special attribute &mdash; <code>android:apiKey</code>. For example: </li>
-
-<pre>&lt;com.google.android.maps.MapView
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:enabled="true"
- android:clickable="true"
- android:apiKey="example_Maps_ApiKey_String"
- /&gt;</pre>
-</li>
-
-<p>For MapView objects instantiated directly from code, pass the Maps API Key string as a parameter in the constructor. For example: </p>
-
-<pre>mMapView = new MapView(this, "example_Maps_ApiKey_String");</pre> 
-
-<p>For more information about MapView, see the MapView class Documentation. </p>
-
-<h2 id="finalsteps">Final Steps to Enable MapView Elements</h2>
-
-<p>If you've added the Maps API Key to the MapViews in your application, here are the final steps to enable the MapView elements to run properly:</p>
-
-<ul>
-<li>Make sure that you added a <code>&lt;uses-library&gt;</code> element referencing the external <code>com.google.android.maps</code> library. The element must be a child of the <code>&lt;application&gt;</code> element in the application's manifest. For example: 
-
-<p><pre>&lt;manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.example.package.name"&gt;
- ...
- &lt;application android:name="MyApplication" &gt;
-   &lt;uses-library android:name="com.google.android.maps" /&gt;
- ...
- &lt;/application&gt;</pre></p></li>
-
-<li>Sign your application with the certificate that corresponds to the Maps API Key referenced in your MapView elements. </li>
-
-</ul>
-
-<div class="special"><p>Note that, when you are ready to publish your application, you must get a Maps API Key that is based on the certificate that you will use to sign the application for release. You must then change the Maps API Key string referenced by all of your MapView elements, so that they reference the new Key. </p></div>
-
-
-
diff --git a/docs/html/guide/topics/location/index.jd b/docs/html/guide/topics/location/index.jd
index 53f1d290ba64..d7a8ff27585f 100644
--- a/docs/html/guide/topics/location/index.jd
+++ b/docs/html/guide/topics/location/index.jd
@@ -1,35 +1,43 @@
-page.title=Location
+page.title=Location and Maps
 @jd:body
 
 <div id="qv-wrapper">
 <div id="qv">
 
+  <h2>Location and Maps quickview</h2>
+  <ul>
+    <li>Android provides a location framework that your application can use to determine the device's location and bearing and register for updates.</li>
+    <li>A Google Maps external library is available that lets you display and manage Maps data.</li>
+  </ul>
   <h2>In this document</h2>
   <ol>
-    <li><a href="#location">android.location</a></li>
-    <li><a href="#maps">com.google.android.maps</a></li>
+    <li><a href="#location">Location Services</a></li>
+    <li><a href="#maps">Google Maps External Library</a></li>
+  </ol>
+  <h2>See Also</h2>
+  <ol>
+    <li><a href="http://code.google.com/android/add-ons/google-apis/index.html">Google APIs add-on download&raquo;</a></li>
   </ol>
 </div>
 </div>
 
-<p>The Android SDK includes two packages that provide Android's primary support
-for building location-based services:
-{@link android.location} and {@link-fixme com.google.android.maps}. 
-Please read on below for a brief introduction to each package.</p>
+<p>Location- and maps-based applications and services are compelling for mobile device users. You can build these capabilities into your applications using the classes of the {@link android.location} package and the Google Maps external library. The sections below provide details. </p>
+
+<h2 id="location">Location Services</h2>
 
-<h2 id="location">android.location</h2>
+<p>Android gives your applications access to the location services supported by
+the device through the classes in the <code>android.location</code> package. The
+central component of the location framework is the 
+{@link android.location.LocationManager} system service, which provides an API to
+determine location and bearing if the underlying device (if it supports location
+capabilities). </p>
 
-<p>This package contains several classes related to
-location services in the Android platform. Most importantly, it introduces the 
-{@link android.location.LocationManager}
-service, which provides an API to determine location and bearing if the
-underlying device (if it supports the service). The LocationManager 
-should <strong>not</strong> be
-instantiated directly; rather, a handle to it should be retrieved via
-{@link android.content.Context#getSystemService(String)
-getSystemService(Context.LOCATION_SERVICE)}.</p>
+<p>As with other system services, you do not instantiate a LocationManager directly. 
+Rather, you request an LocationManager instance from the system by calling 
+{@link android.content.Context#getSystemService(String) getSystemService(Context.LOCATION_SERVICE)}. 
+The method returns a handle to a new LocationManager instance.</p>
 
-<p>Once your application has a handle to the LocationManager, your application
+<p>Once your application has a handle to a LocationManager instance, your application 
 will be able to do three things:</p>
 
 <ul>
@@ -42,20 +50,20 @@ will be able to do three things:</p>
     lat/long.</li>
 </ul>
 
-<p>However, during initial development, you may not have access to real 
-data from a real location provider (Network or GPS). So it may be necessary to
-spoof some data for your application, with some mock location data.</p>
+<p>However, during initial development in the emulator, you may not have access to real 
+data from a real location provider (Network or GPS). In that case, it may be necessary to
+spoof some data for your application using a mock location provider.</p>
 
 <p class="note"><strong>Note:</strong> If you've used mock LocationProviders in
-previous versions of the SDK (m3/m5), you can no longer provide canned LocationProviders
+previous versions of the SDK, you can no longer provide canned LocationProviders
 in the /system/etc/location directory. These directories will be wiped during boot-up.
-Please follow the new procedures below.</p>
-
+Please follow the new procedures outlined below.</p>
 
 <h3>Providing Mock Location Data</h3>
 
 <p>When testing your application on the Android emulator, there are a couple different
-ways to send it some spoof location data: with the DDMS tool or the "geo" command.</p>
+ways to send it some mock location data: you can use the DDMS tool or the "geo" command 
+option in the emulator console.</p>
 
 <h4 id="ddms">Using DDMS</h4>
 <p>With the DDMS tool, you can simulate location data a few different ways:</p>
@@ -67,9 +75,9 @@ ways to send it some spoof location data: with the DDMS tool or the "geo" comman
 <p>For more information on using DDMS to spoof location data, see the 
 <a href="{@docRoot}guide/developing/tools/ddms.html#emulator-control">Using DDMS guide</a>.
 
-<h4 id="geo">Using the "geo" command</h4>
+<h4 id="geo">Using the "geo" command in the emulator console</h4>
 <p>Launch your application in the Android emulator and open a terminal/console in
-your SDK's <code>/tools</code> directory. Now you can use:</p>
+your SDK's <code>/tools</code> directory. Connect to the emulator console. Now you can use:</p>
 <ul><li><code>geo fix</code> to send a fixed geo-location.
 	<p>This command accepts a longitude and latitude in decimal degrees, and
 	an optional altitude in meters. For example:</p>
@@ -82,28 +90,52 @@ your SDK's <code>/tools</code> directory. Now you can use:</p>
     </li>
 </ul>
 
-
-<h2 id="maps">com.google.android.maps</h2>
-
-<p>This package introduces a number of classes related to
-rendering, controlling, and overlaying customized information on your own
-Google Mapified Activity. The most important of which is the 
-{@link-fixme com.google.android.maps.MapView} class, which automagically draws you a 
-basic Google Map when you add a MapView to your layout. Note that, if you 
-want to do so, then your Activity that handles the 
-MapView must extend {@link-fixme com.google.android.maps.MapActivity}. </p>
-
-<p>Also note that you must obtain a MapView API Key from the Google Maps
-service, before your MapView can load maps data. For more information, see 
-<a href="{@docRoot}guide/topics/location/geo/mapkey.html">Obtaining a MapView API Key</a>.</p>
-
-<p>Once you've created a MapView, you'll probably want to use 
-{@link-fixme com.google.android.maps.MapView#getController()} to 
-retrieve a {@link-fixme com.google.android.maps.MapController}, for controlling and 
-animating the map, and {@link-fixme com.google.android.maps.ItemizedOverlay} to
-draw {@link-fixme com.google.android.maps.Overlay}s and other information on the Map.</p>
-
-<p>This is not a standard package in the Android library. In order to use it, you must add the following node to your Android Manifest file, as a child of the 
-<code>&lt;application></code> element:</p>
-<pre>&lt;uses-library android:name="com.google.android.maps" /></pre>
+<p>For information about how to connect to the emulator console, see 
+<a href="{@docRoot}guide/developing/tools/emulator.html#console">Using the Emulator Console</a>.</p>
+
+<h2 id="maps">Google Maps External Library</h2>
+
+<p>To make it easier for you to add powerful mapping capabilities to your
+application, Google provides a Maps external library that includes the
+com.google.android.maps package. The classes of the com.google.android.maps
+package offer built-in downloading, rendering, and caching of Maps tiles, as
+well as a variety of display options and controls. </p>
+
+<p>The key class in the Maps package is
+<code>com.google.android.maps.MapView</code>, a subclass of 
+{@link android.view.ViewGroup ViewGroup}. A MapView displays a map with data obtained
+from the Google Maps service. When the MapView has focus, it will capture
+keypresses and touch gestures to pan and zoom the map automatically, including
+handling network requests for additional maps tiles. It also provides all of the
+UI elements necessary for users to control the map. Your application can also
+use MapView class methods to control the MapView programmatically and draw a
+number of Overlay types on top of the map. </p>
+
+<p>In general, the MapView class provides a wrapper around the Google Maps API
+that lets your application manipulate Google Maps data through class methods,
+and it lets you work with Maps data as you would other types of Views.</p>
+
+<p>The Maps external library is not part of the standard Android library, so it
+may not be present on some compliant Android-powered devices (although it is
+likely to be present on most devices). Similarly, the Maps external library is
+not included in the standard Android library provided in the SDK. So that you
+can develop using the classes of the com.google.android.maps package, the Maps
+external library is made available to you as part of the Google APIs add-on for
+the Android SDK. </p>
+
+<p>To learn more about the Maps external library and how to download and use the
+Google APIs add-on, visit</p>
+
+<p style="margin-left:2em;"><a
+href="http://code.google.com/android/add-ons/google-apis">http://code.google.com/android/add-ons/google-apis</a></p>
+
+<p>For your convenience, the Google APIs add-on is also included in the Android
+SDK. <!-- To learn now to use the Maps external library in your application, see
+[[Using External Libraries]].--></p>
+
+<p class="note"><strong>Note:</strong> In order to display Google Maps data in a
+MapView, you must register with the Google Maps service and obtain a Maps API
+Key. For information about how to get a Maps API Key, see <a
+href="http://code.google.com/android/add-ons/google-apis/mapkey.html">Obtaining
+a Maps API Key</a>.</p>
 
diff --git a/docs/html/guide/topics/manifest/action-element.jd b/docs/html/guide/topics/manifest/action-element.jd
index bc2e1d3a2766..d7ba78d73418 100644
--- a/docs/html/guide/topics/manifest/action-element.jd
+++ b/docs/html/guide/topics/manifest/action-element.jd
@@ -40,6 +40,10 @@ as follows:
 </dd>
 </dl></dd>
 
+<!-- ##api level indication## -->
+<dt>introduced in:</dt>
+<dd>API Level 1</dd>
+
 <dt>see also:</dt>
 <dd><code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html">&lt;intent-filter&gt;</a></code></dd>
 
diff --git a/docs/html/guide/topics/manifest/activity-alias-element.jd b/docs/html/guide/topics/manifest/activity-alias-element.jd
index 9d81d502e46d..4521b4bddc3f 100644
--- a/docs/html/guide/topics/manifest/activity-alias-element.jd
+++ b/docs/html/guide/topics/manifest/activity-alias-element.jd
@@ -123,6 +123,10 @@ the alias in the manifest.
 </p></dd>
 </dl></dd>
 
+<!-- ##api level indication## -->
+<dt>introduced in:</dt>
+<dd>API Level 1</dd>
+
 <dt>see also:</dt>
 <dd><code><a href="{@docRoot}guide/topics/manifest/activity-element.html">&lt;activity&gt;</a></code></dd>
 
diff --git a/docs/html/guide/topics/manifest/activity-element.jd b/docs/html/guide/topics/manifest/activity-element.jd
index aba89d72cd6c..83237c61dd5b 100644
--- a/docs/html/guide/topics/manifest/activity-element.jd
+++ b/docs/html/guide/topics/manifest/activity-element.jd
@@ -19,6 +19,7 @@ page.title=&lt;activity&gt;
                               "singleTask" | "singleInstance"]
           android:<a href="#multi">multiprocess</a>=["true" | "false"]
           android:<a href="#nm">name</a>="<i>string</i>"
+          android:<a href="#nohist">noHistory</a>=["true" | "false"]  <!-- ##api level 3## -->
           android:<a href="#prmsn">permission</a>="<i>string</i>"
           android:<a href="#proc">process</a>="<i>string</i>"
           android:<a href="#screen">screenOrientation</a>=["unspecified" | "user" | "behind" |
@@ -26,7 +27,12 @@ page.title=&lt;activity&gt;
                                      "sensor" | "nonsensor"]
           android:<a href="#state">stateNotNeeded</a>=["true" | "false"]
           android:<a href="#aff">taskAffinity</a>="<i>string</i>"
-          android:<a href="#theme">theme</a>="<i>resource or theme</i>" &gt;
+          android:<a href="#theme">theme</a>="<i>resource or theme</i>" 
+          android:<a href="#wsoft">windowSoftInputMode</a>=[<i>one or more of</i>: "stateUnspecified" 
+                                       "stateUnchanged" "stateHidden" 
+                                       "stateAlwaysHidden" "stateVisible" 
+                                       "stateAlwaysVisible" "adjustUnspecified" 
+                                       "adjustResize" "adjustPan"] &gt;   <!-- ##api level 3## -->
     . . .
 &lt;/activity&gt;</pre></dd>
 
@@ -158,8 +164,8 @@ separated by '{@code |}' &mdash; for example, "{@code locale|navigation|orientat
 
 <table>
 <tr>
-   <td><b>Value</b></td>
-   <td><b>Description</b></td>
+   <th>Value</th>
+   <th>Description</th>
 </tr><tr>
    <td>"{@code mcc}"</td>
    <td>The IMSI mobile country code (MCC) has changed &mdash; 
@@ -212,12 +218,12 @@ is "{@code true}".
 
 <p>
 The <code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> element has its own 
-<code><a href="{@docRoot}guide/topics/manifest/application-element.html#enabled">enabled</a></code> attribute that applies to all 
-application components, including activities.  The 
-<code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> and {@code &lt;activity&gt;} 
-attributes must both be "{@code true}" (as they both are by default) for 
-the system to be able to instantiate the activity.  If either is 
-"{@code false}", it cannot be instantiated.
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html#enabled">enabled</a></code> 
+attribute that applies to all application components, including activities.  The 
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> 
+and {@code &lt;activity&gt;} attributes must both be "{@code true}" (as they both 
+are by default) for the system to be able to instantiate the activity.  If either 
+is "{@code false}", it cannot be instantiated.
 </p></dd>
 
 <dt><a name="exclude"></a>{@code android:excludeFromRecents}</dt>
@@ -246,7 +252,8 @@ is intended for external use, so the default value is "{@code true}".
 <p>
 This attribute is not the only way to limit an activity's exposure to other
 applications.  You can also use a permission to limit the external entities that 
-can invoke the activity  (see the <code><a href="{@docRoot}guide/topics/manifest/activity-element.html#prmsn">permission</a></code> 
+can invoke the activity  (see the 
+<code><a href="{@docRoot}guide/topics/manifest/activity-element.html#prmsn">permission</a></code> 
 attribute).
 </p></dd>
 
@@ -257,7 +264,8 @@ home screen) &mdash; "{@code true}" if it should be shut down, and "{@code false
 if not.  The default value is "{@code false}". 
 
 <p>
-If this attribute and <code><a href="{@docRoot}guide/topics/manifest/activity-element.html#reparent">allowTaskReparenting</a></code> 
+If this attribute and 
+<code><a href="{@docRoot}guide/topics/manifest/activity-element.html#reparent">allowTaskReparenting</a></code> 
 are both "{@code true}", this attribute trumps the other.  The affinity of the 
 activity is ignored.  The activity is not re-parented, but destroyed.
 </p>
@@ -272,14 +280,15 @@ The icon is often accompanied by a label (see the {@code label} attribute).
 <p>
 This attribute must be set as a reference to a drawable resource containing 
 the image definition.  If it is not set, the icon specified for the application 
-as a whole is used instead (see the <code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> 
+as a whole is used instead (see the 
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> 
 element's <code><a href="{@docRoot}guide/topics/manifest/application-element.html#icon">icon</a></code> attribute).
 </p>
 
 <p>
 The activity's icon &mdash; whether set here or by the 
-<code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> element &mdash; is also the 
-default icon for all the activity's intent filters (see the 
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> 
+element &mdash; is also the default icon for all the activity's intent filters (see the 
 <code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html">&lt;intent-filter&gt;</a></code> element's 
 <code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html#icon">icon</a></code> attribute). 
 </p></dd>
@@ -413,6 +422,24 @@ element.
 There is no default.  The name must be specified.
 </p></dd>
 
+<!-- ##api level 3## -->
+<dt><a name="nohist"></a>{@code android:noHistory}</dt>
+<dd>Whether or not the activity should be removed from the activity stack and
+finished (its <code>{@link android.app.Activity#finish finish()}</code> 
+method called) when the user navigates away from it and it's no longer 
+visible on screen &mdash; "{@code true}" if it should be finished, and 
+"{@code false}" if not.  The default value is "{@code false}".
+
+<p>
+A value of "{@code true}" means that the activity will not leave a
+historical trace.  It will not remain in the activity stack for the task,
+so the user will not be able to return to it.
+</p>
+
+<p>
+This attribute was introduced in API Level 3.
+</p>
+
 <dt><a name="prmsn"></a>{@code android:permission}</dt>
 <dd>The name of a permission that clients must have to launch the activity 
 or otherwise get it to respond to an intent.  If a caller of 
@@ -423,9 +450,10 @@ delivered to the activity.
 
 <p>
 If this attribute is not set, the permission set by the 
-<code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> element's
-<code><a href="{@docRoot}guide/topics/manifest/application-element.html#prmsn">permission</a></code> attribute applies 
-to the activity.  If neither attribute is set, the activity is
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> 
+element's
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html#prmsn">permission</a></code> 
+attribute applies to the activity.  If neither attribute is set, the activity is
 not protected by a permission.
 </p>
 
@@ -441,9 +469,10 @@ Permissions</a>.
 <dd>The name of the process in which the activity should run.  Normally, 
 all components of an application run in the default process created for the 
 application.  It has the same name as the application package.  The <code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> element's 
-<code><a href="{@docRoot}guide/topics/manifest/application-element.html#proc">process</a></code> attribute can set a different 
-default for all components.  But each component can override the default,
-allowing you to spread your application across multiple processes.
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html#proc">process</a></code> 
+attribute can set a different default for all components.  But each component 
+can override the default, allowing you to spread your application across 
+multiple processes.
 
 <p>
 If the name assigned to this attribute begins with a colon (':'), a new 
@@ -540,10 +569,14 @@ it to an empty string.
 
 <p>
 If this attribute is not set, the activity inherits the affinity set 
-for the application (see the <code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> 
-element's <code><a href="{@docRoot}guide/topics/manifest/application-element.html#aff">taskAffinity</a></code> attribute).  
-The name of the default affinity for an application is the package name set 
-by the <code><a href="{@docRoot}guide/topics/manifest/manifest-element.html">&lt;manifest&gt;</a></code> element.
+for the application (see the 
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> 
+element's 
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html#aff">taskAffinity</a></code>
+attribute).  The name of the default affinity for an application is 
+the package name set by the 
+<code><a href="{@docRoot}guide/topics/manifest/manifest-element.html">&lt;manifest&gt;</a></code> 
+element.
 </p>
 
 <dt><a name="theme"></a>{@code android:theme}</dt>
@@ -555,11 +588,123 @@ match what the activity actually looks like).
 
 <p>
 If this attribute is not set, the activity inherits the theme set for the 
-application as a whole &mdash; see the <code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> 
-element's <code><a href="{@docRoot}guide/topics/manifest/application-element.html#theme">theme</a></code> attribute.  If that attribute is 
-also not set, the default system theme is used.
+application as a whole &mdash; see the 
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> 
+element's 
+<code><a href="{@docRoot}guide/topics/manifest/application-element.html#theme">theme</a></code> 
+attribute.  If that attribute is also not set, the default system theme is used.
 </p>
-<dd> 
+<dd>
+
+<!-- ##api level 3## -->
+<dt><a name="wsoft"></a>{@code android:windowSoftInputMode}</dt>
+<dd>How the main window of the activity interacts with the window containing 
+the on-screen soft keyboard.  The setting for this attribute affects two 
+things: 
+
+<ul> 
+<li>The state of the soft keyboard &mdash; whether it is hidden or visible 
+&mdash; when the activity becomes the focus of user attention.</li>
+
+<li>The adjustment made to the activity's main window &mdash; whether it is 
+resized smaller to make room for the soft keyboard or whether its contents 
+pan to make the current focus visible when part of the window is covered by 
+the soft keyboard.</li>
+</ul>
+
+<p>
+The setting must be one of the values listed in the following table, or a 
+combination of one "{@code state...}" value plus one "{@code adjust...}" 
+value.  Setting multiple values in either group &mdash; multiple 
+"{@code state...}" values, for example &mdash has undefined results.  
+Individual values are separated by a vertical bar ({@code |}).  For example:
+</p>
+
+<pre>&lt;activity android:windowSoftInputMode="stateVisible|adjustResize" . . . &gt;</pre>
+
+<p>
+Values set here (other than "{@code stateUnspecified}" and 
+"{@code adjustUnspecified}") override values set in the theme.
+</p>
+
+<table>
+<tr>
+   <th>Value</th>
+   <th>Description</th>
+</tr><tr>
+   <td>"{@code stateUnspecified}"</td>
+   <td>The state of the soft keyboard (whether it is hidden or visible) 
+       is not specified.  The system will choose an appropriate state or
+       rely on the setting in the theme.  
+
+       <p>
+       This is the default setting for the behavior of the soft keyboard.
+       </p></td>
+</tr></tr>
+   <td>"{@code stateUnchanged}"</td>
+   <td>The soft keyboard is kept in whatever state it was last in,
+       whether visible or hidden, when the activity comes to the fore.</td>
+</tr></tr>
+   <td>"{@code stateHidden}"</td>
+   <td>The soft keyboard is hidden when the user chooses the activity 
+       &mdash; that is, when the user affirmatively navigates forward to the 
+       activity, rather than backs into it because of leaving another activity.</td>
+</tr></tr>
+   <td>"{@code stateAlwaysHidden}"</td>
+   <td>The soft keyboard is always hidden when the activity's main window 
+       has input focus.</td>
+</tr></tr>
+   <td>"{@code stateVisible}"</td>
+   <td>The soft keyboard is visible when that's normally appropriate 
+       (when the user is navigating forward to the activity's main window).</td>
+</tr></tr>
+   <td>"{@code stateAlwaysVisible}"</td>
+   <td>The soft keyboard is made visible when the user chooses the 
+       activity &mdash; that is, when the user affirmatively navigates forward 
+       to the activity, rather than backs into it because of leaving another 
+       activity.</td>
+</tr></tr>
+   <td>"{@code adjustUnspecified}"</td>
+   <td>It is unspecified whether the activity's main window resizes 
+       to make room for the soft keyboard, or whether the contents 
+       of the window pan to make the currentfocus visible on-screen. 
+       The system will automatically select one of these modes depending
+       on whether the content of the window has any layout views that 
+       can scroll their contents.  If there is such a view, the window 
+       will be resized, on the assumption that scrolling can make all 
+       of the window's contents visible within a smaller area.
+
+       <p>
+       This is the default setting for the behavior of the main window.
+       </p></td>
+</tr></tr>
+   <td>"{@code adjustResize}"</td>
+   <td>The activity's main window is always resized to make room for 
+       the soft keyboard on screen.</td>
+</tr></tr>
+   <td>"{@code adjustPan}"</td>
+   <td>The activity's main window is not resized to make room for the soft
+       keyboard.  Rather, the contents of the window are automatically 
+       panned so that the current focus is never obscured by the keyboard
+       and users can always see what they are typing.  This is generally less 
+       desireable than resizing, because the user may need to close the soft
+       keyboard to get at and interact with obscured parts of the window.</td>
+</tr>
+</table>
+
+<p>
+This attribute was introduced in API Level 3.
+</p></dd>
 </dl></dd>
 
+<!-- ##api level indication## -->
+<dt>introduced in:</dt>
+<dd>API Level 1 for all attributes except for 
+<code><a href="#nohist">noHistory</a></code> and
+<code><a href="#wsoft">windowSoftInputMode</a></code>, which were added in API 
+Level 3.</dd>
+
+<dt>see also:</dt>
+<dd><code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> 
+<br/><code><a href="{@docRoot}guide/topics/manifest/activity-alias-element.html">&lt;activity-alias&gt;</a></code></dd>
 </dl>
\ No newline at end of file
diff --git a/docs/html/guide/topics/manifest/application-element.jd b/docs/html/guide/topics/manifest/application-element.jd
index 362c205880f9..5b3fcd53f1da 100644
--- a/docs/html/guide/topics/manifest/application-element.jd
+++ b/docs/html/guide/topics/manifest/application-element.jd
@@ -217,6 +217,10 @@ attributes; see that attribute for more information.</dd>
 
 </dl></dd>
 
+<!-- ##api level indication## -->
+<dt>introduced in:</dt>
+<dd>API Level 1</dd>
+
 <dt>see also:</dt>
 <dd><code><a href="{@docRoot}guide/topics/manifest/activity-element.html">&lt;activity&gt;</a></code>
 <br/><code><a href="{@docRoot}guide/topics/manifest/service-element.html">&lt;service&gt;</a></code>
diff --git a/docs/html/guide/topics/manifest/category-element.jd b/docs/html/guide/topics/manifest/category-element.jd
index 50ea57674abc..b9a1aa68df65 100644
--- a/docs/html/guide/topics/manifest/category-element.jd
+++ b/docs/html/guide/topics/manifest/category-element.jd
@@ -29,7 +29,11 @@ the string value for {@code CATEGORY_LAUNCHER} is
 Custom categories should use the package name as a prefix, to ensure
 that they are unique.
 </p></dd>
-</dl></dd>
+</dl></dd> 
+
+<!-- ##api level indication## -->
+<dt>introduced in:</dt>
+<dd>API Level 1</dd>
 
 <dt>see also:</dt>
 <dd><code><a href="{@docRoot}guide/topics/manifest/action-element.html">&lt;action&gt;</a></code>
diff --git a/docs/html/guide/topics/manifest/data-element.jd b/docs/html/guide/topics/manifest/data-element.jd
index 5d8fde25b08d..b48c5e043247 100644
--- a/docs/html/guide/topics/manifest/data-element.jd
+++ b/docs/html/guide/topics/manifest/data-element.jd
@@ -72,12 +72,21 @@ section in the introduction.
 <dd>The host part of a URI authority.  This attribute is meaningless
 unless a <code><a href="{@docRoot}guide/topics/manifest/data-element.html#scheme">scheme</a></code> attribute is also 
 specified for the filter.
+
+<p class="note">Note: host name matching in the Android framework is
+case-sensitive, unlike the formal RFC.  As a result, you should always specify
+host names using lowercase letters.</p>
 </dd>
 
 <dt><a name="mime"></a>{@code android:mimeType}</dt>
 <dd>A MIME media type, such as {@code image/jpeg} or {@code audio/mpeg4-generic}.  
 The subtype can be the asterisk wildcard ({@code *}) to indicate that any 
-subtype matches.</dd>
+subtype matches.
+
+<p class="note">Note: MIME type matching in the Android framework is
+case-sensitive, unlike formal RFC MIME types.  As a result, you should always
+specify MIME types using lowercase letters.</p>
+</dd>
 
 <dt><a name="path"></a>{@code android:path}
 <br/>{@code android:pathPrefix}
@@ -138,9 +147,18 @@ A scheme is specified without the trailing colon (for example,
 If the filter has a data type set (the <code><a href="{@docRoot}guide/topics/manifest/data-element.html#mime">mimeType</a></code> 
 attribute) but no scheme, the {@code content:} and {@code file:} schemes are
 assumed.
-</p></dd>
+</p>
+
+<p class="note">Note: scheme matching in the Android framework is
+case-sensitive, unlike the RFC.  As a result, you should always specify schemes
+using lowercase letters.</p>
+</dd>
 </dl></dd>  
 
+<!-- ##api level indication## -->
+<dt>introduced in:</dt>
+<dd>API Level 1</dd>
+
 <dt>see also:</dt>
 <dd><code><a href="{@docRoot}guide/topics/manifest/action-element.html">&lt;action&gt;</a></code>
 <br/><code><a href="{@docRoot}guide/topics/manifest/category-element.html">&lt;category&gt;</a></code></dd>
diff --git a/docs/html/guide/topics/manifest/grant-uri-permission-element.jd b/docs/html/guide/topics/manifest/grant-uri-permission-element.jd
index f5b37b5364b2..9dafe8514f12 100644
--- a/docs/html/guide/topics/manifest/grant-uri-permission-element.jd
+++ b/docs/html/guide/topics/manifest/grant-uri-permission-element.jd
@@ -74,6 +74,10 @@ For more information on these types of patterns, see the descriptions of
 </p></dd>
 </dl></dd>
 
+<!-- ##api level indication## -->
+<dt>introduced in:</dt>
+<dd>API Level 1</dd>
+
 <dt>see also:</dt>
 <dd>the 
 <code><a href="{@docRoot}guide/topics/manifest/provider-element.html#gprmns">grantUriPermissions</a></code>
diff --git a/docs/html/guide/topics/manifest/instrumentation-element.jd b/docs/html/guide/topics/manifest/instrumentation-element.jd
index fdec949594eb..1fd1dd0b2db9 100644
--- a/docs/html/guide/topics/manifest/instrumentation-element.jd
+++ b/docs/html/guide/topics/manifest/instrumentation-element.jd
@@ -51,6 +51,10 @@ name specified in the <code><a href="{@docRoot}guide/topics/manifest/manifest-el
 There is no default.  The name must be specified.
 </p></dd>
 
+<!-- ##api level indication## -->
+<dt>introduced in:</dt>
+<dd>API Level 1</dd>
+
 <dt><a name="trgt"></a>{@code android:targetPackage}</dt>
 <dd>The application that the Instrumentation object will run against.
 An application is identified by the package name assigned in its manifest
diff --git a/docs/html/guide/topics/manifest/intent-filter-element.jd b/docs/html/guide/topics/manifest/intent-filter-element.jd
index 58d1f9114426..2b1322c5021f 100644
--- a/docs/html/guide/topics/manifest/intent-filter-element.jd
+++ b/docs/html/guide/topics/manifest/intent-filter-element.jd
@@ -122,6 +122,10 @@ higher priority.
 
 </dl></dd>
 
+<!-- ##api level indication## -->
+<dt>introduced in:</dt>
+<dd>API Level 1</dd>
+
 <dt>see also:</dt>
 <dd><code><a href="{@docRoot}guide/topics/manifest/action-element.html">&lt;action&gt;</a></code>
 <br/><code><a href="{@docRoot}guide/topics/manifest/category-element.html">&lt;category&gt;</a></code>
diff --git a/docs/html/guide/topics/manifest/manifest-element.jd b/docs/html/guide/topics/manifest/manifest-element.jd
index 266948746f4a..a9d10906add0 100644
--- a/docs/html/guide/topics/manifest/manifest-element.jd
+++ b/docs/html/guide/topics/manifest/manifest-element.jd
@@ -6,6 +6,7 @@ page.title=&lt;manifest&gt;
 <dd><pre class="stx">&lt;manifest xmlns:<a href="#nspace">android</a>="http://schemas.android.com/apk/res/android"
           <a href="#package">package</a>="<i>string</i>"
           android:<a href="#uid">sharedUserId</a>="<i>string</i>"
+          android:<a href="#uidlabel">sharedUserLabel</a>="<i>string resource</i>" <!-- ##api level 3## -->
           android:<a href="#vcode">versionCode</a>="<i>integer</i>"
           android:<a href="#vname">versionName</a>="<i>string</i>" &gt;
     . . .
@@ -25,7 +26,9 @@ page.title=&lt;manifest&gt;
 <br/><code><a href="{@docRoot}guide/topics/manifest/permission-element.html">&lt;permission&gt;</a></code>
 <br/><code><a href="{@docRoot}guide/topics/manifest/permission-group-element.html">&lt;permission-group&gt;</a></code>
 <br/><code><a href="{@docRoot}guide/topics/manifest/permission-tree-element.html">&lt;permission-tree&gt;</a></code>
+<br/><code><a href="{@docRoot}guide/topics/manifest/uses-configuration-element.html">&lt;uses-configuration&gt;</a></code>  <!-- ##api level 3## -->
 <br/><code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html">&lt;uses-permission&gt;</a></code></dd>
+<br/><code><a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html">&lt;uses-sdk&gt;</a></code></dd>
 
 <p>
 <dt>description:</dt>
@@ -63,7 +66,17 @@ By default, Android assigns each application its own unique user ID.
 However, if this attribute is set to the same value for two or more applications, 
 they will all share the same ID &mdash; provided that they are also signed 
 by the same certificate.  Application with the same user ID can access each 
-other's data and, if desired, run in the same  process.</dd>  
+other's data and, if desired, run in the same process.</dd>
+
+<dt><a name="uidlabel"></a>{@code android:sharedUserLabel}</dt>
+<dd>A user-readable label for the shared user ID.  The label must be set as
+a reference to a string resource; it cannot be a raw string.
+
+<p>
+<!-- ##api level indication## -->
+This attribute was introduced in API Level 3.  It is meaningful only if the 
+<code><a href="#uid">sharedUserId</a></code> attribute is also set.
+</p></dd>      
 
 <dt><a name="vcode"></a>{@code android:versionCode}</dt>
 <dd>An internal version number.  This number is used only to determine whether 
@@ -87,6 +100,12 @@ than to be displayed to users.  The {@code versionCode} attribute holds
 the significant version number used internally.
 </dl></dd>
 
+<!-- ##api level indication## -->
+<dt>introduced in:</dt>
+<dd>API Level 1 for all attributes except for 
+<code><a href="#uidlabel">sharedUserLabel</a></code>, which was added in 
+level 3.</dd>
+
 <p>
 <dt>see also:</dt>
 <dd><code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code></dd>
diff --git a/docs/html/guide/topics/manifest/manifest-intro.jd b/docs/html/guide/topics/manifest/manifest-intro.jd
index aa14308d3898..190702451f8d 100644
--- a/docs/html/guide/topics/manifest/manifest-intro.jd
+++ b/docs/html/guide/topics/manifest/manifest-intro.jd
@@ -115,6 +115,7 @@ other mention of the element name.
         <a href="{@docRoot}guide/topics/manifest/provider-element.html">&lt;/provider&gt;</a>
 
         <a href="{@docRoot}guide/topics/manifest/uses-library-element.html">&lt;uses-library /&gt;</a>
+        <a href="{@docRoot}guide/topics/manifest/uses-configuration-element.html">&lt;uses-configuration /&gt;</a>  <!-- ##api level 3## -->
 
     <a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;/application&gt;</a>
 
@@ -145,6 +146,7 @@ add your own elements or attributes.
 <br/><code><a href="{@docRoot}guide/topics/manifest/provider-element.html">&lt;provider&gt;</a></code>
 <br/><code><a href="{@docRoot}guide/topics/manifest/receiver-element.html">&lt;receiver&gt;</a></code>
 <br/><code><a href="{@docRoot}guide/topics/manifest/service-element.html">&lt;service&gt;</a></code>
+<br/><code><a href="{@docRoot}guide/topics/manifest/uses-configuration-element.html">&lt;uses-configuration&gt;</a></code>  <!-- ##api level 3## -->
 <br/><code><a href="{@docRoot}guide/topics/manifest/uses-library-element.html">&lt;uses-library&gt;</a></code>
 <br/><code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html">&lt;uses-permission&gt;</a></code>
 <br/><code><a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html">&lt;uses-sdk&gt;</a></code>
diff --git a/docs/html/guide/topics/manifest/meta-data-element.jd b/docs/html/guide/topics/manifest/meta-data-element.jd
index 1c914077e773..101b05a4987e 100644
--- a/docs/html/guide/topics/manifest/meta-data-element.jd
+++ b/docs/html/guide/topics/manifest/meta-data-element.jd
@@ -87,4 +87,8 @@ to the item.  The ID can be retrieved from the meta-data Bundle by the
 </dd>
 </dl></dd>
 
+<!-- ##api level indication## -->
+<dt>introduced in:</dt>
+<dd>API Level 1</dd>
+
 </dl>
diff --git a/docs/html/guide/topics/manifest/permission-element.jd b/docs/html/guide/topics/manifest/permission-element.jd
index 6eef081b2318..ad64d5dd31f7 100644
--- a/docs/html/guide/topics/manifest/permission-element.jd
+++ b/docs/html/guide/topics/manifest/permission-element.jd
@@ -122,6 +122,10 @@ The value can be set to one of the following strings:
 </dd>
 </dl></dd>
 
+<!-- ##api level indication## -->
+<dt>introduced in:</dt>
+<dd>API Level 1</dd>
+
 <dt>see also:</dt>
 <dd><code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html">&lt;uses-permission&gt;</a></code>
 <br/><code><a href="{@docRoot}guide/topics/manifest/permission-tree-element.html">&lt;permission-tree&gt;</a></code>
diff --git a/docs/html/guide/topics/manifest/permission-group-element.jd b/docs/html/guide/topics/manifest/permission-group-element.jd
index 9cfca6edac75..0ad76a68044f 100644
--- a/docs/html/guide/topics/manifest/permission-group-element.jd
+++ b/docs/html/guide/topics/manifest/permission-group-element.jd
@@ -51,6 +51,10 @@ element's
 attribute.</dd>
 </dl></dd>
 
+<!-- ##api level indication## -->
+<dt>introduced in:</dt>
+<dd>API Level 1</dd>
+
 <dt>see also:</dt>
 <dd><code><a href="{@docRoot}guide/topics/manifest/permission-element.html">&lt;permission&gt;</a></code>
 <br/><code><a href="{@docRoot}guide/topics/manifest/permission-tree-element.html">&lt;permission-tree&gt;</a></code>
diff --git a/docs/html/guide/topics/manifest/permission-tree-element.jd b/docs/html/guide/topics/manifest/permission-tree-element.jd
index e2f7474258a1..3074354c773e 100644
--- a/docs/html/guide/topics/manifest/permission-tree-element.jd
+++ b/docs/html/guide/topics/manifest/permission-tree-element.jd
@@ -51,7 +51,10 @@ two period-separated seqments in its path &mdash; for example,
 
 </dl></dd>
 
-<p>
+<!-- ##api level indication## -->
+<dt>introduced in:</dt>
+<dd>API Level 1</dd>
+
 <dt>see also:</dt>
 <dd><code><a href="{@docRoot}guide/topics/manifest/permission-element.html">&lt;permission&gt;</a></code>
 <br/><code><a href="{@docRoot}guide/topics/manifest/permission-group-element.html">&lt;permission-group&gt;</a></code>
diff --git a/docs/html/guide/topics/manifest/provider-element.jd b/docs/html/guide/topics/manifest/provider-element.jd
index 7359e5039562..2bb4ff40f03b 100644
--- a/docs/html/guide/topics/manifest/provider-element.jd
+++ b/docs/html/guide/topics/manifest/provider-element.jd
@@ -260,7 +260,10 @@ See also the <code><a href="#prmsn">permission</a></code> and
 
 </dl></dd>
 
-<p>
+<!-- ##api level indication## -->
+<dt>introduced in:</dt>
+<dd>API Level 1</dd>
+
 <dt>see also:</dt>
 <dd><a href="{@docRoot}guide/topics/providers/content-providers.html">Content Providers</a></dd>
 
diff --git a/docs/html/guide/topics/manifest/receiver-element.jd b/docs/html/guide/topics/manifest/receiver-element.jd
index 8df6273bbf99..280d40243b84 100644
--- a/docs/html/guide/topics/manifest/receiver-element.jd
+++ b/docs/html/guide/topics/manifest/receiver-element.jd
@@ -17,7 +17,7 @@ page.title=&lt;receiver&gt;
 <dd><code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code></dd>
 
 <dt>can contain:</dt>
-<dd><code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html">&lt;intent-filter&gt;</a></code>
+<dd><code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html">&lt;intent-filer&gt;</a></code>
 <br/><code><a href="{@docRoot}guide/topics/manifest/meta-data-element.html">&lt;meta-data&gt;</a></code></dd>
 
 <dt>description:</dt>
@@ -47,16 +47,10 @@ The <code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt
 <code><a href="{@docRoot}guide/topics/manifest/application-element.html#enabled">enabled</a></code> attribute that applies to all 
 application components, including broadcast receivers.  The 
 <code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> and
-{@code &lt;receiver&gt;} elements must both set {@code android:enabled} equal to
-"{@code true}" for the broadcast receiver to be enabled.  If either is "{@code false}",
-the receiver is disabled and cannot be instantiated.
-</p>
-
-<p>
-The default value depends on whether the broadcast receiver contains intent filters.
-If any intent filters are specified, the default value is "{@code true}".  If no
-filters are specified, the default value is "{@code false}".
-</dd>
+{@code &lt;receiver&gt;} attributes must both be "{@code true}" for 
+the broadcast receiver to be enabled.  If either is "{@code false}", it is
+disabled; it cannot be instantiated.
+</p></dd>
 
 <dt><a name="exported"></a>{@code android:exported}</dt>
 <dd>Whether or not the broadcast receiver can receive messages from sources 
@@ -123,12 +117,9 @@ it can also be set as a raw string.
 {@link android.content.BroadcastReceiver}.  This should be a fully qualified 
 class name (such as, "{@code com.example.project.ReportReceiver}").  However, 
 as a shorthand, if the first character of the name is a period (for example, 
-"{@code .ReportReceiver}"), it is appended to the package name specified in 
+"{@code . ReportReceiver}"), it is appended to the package name specified in 
 the <code><a href="{@docRoot}guide/topics/manifest/manifest-element.html">&lt;manifest&gt;</a></code> element.  
 
-<p>The {@link android.content.BroadcastReceiver} subclass can be a static inner
-class, although it cannot be an ordinary (non-static) inner class.
-
 <p>
 There is no default.  The name must be specified.
 </p></dd>
@@ -170,4 +161,8 @@ resource usage.
 </p></dd>
 </dl></dd>
 
+<!-- ##api level indication## -->
+<dt>introduced in:</dt>
+<dd>API Level 1</dd>
+
 </dl>
diff --git a/docs/html/guide/topics/manifest/service-element.jd b/docs/html/guide/topics/manifest/service-element.jd
index ad65abeae791..e5ac7b58148a 100644
--- a/docs/html/guide/topics/manifest/service-element.jd
+++ b/docs/html/guide/topics/manifest/service-element.jd
@@ -173,4 +173,8 @@ resource usage.
 <dd><code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code>
 <br><code><a href="{@docRoot}guide/topics/manifest/activity-element.html">&lt;activity&gt;</a></code></dd>
 
+<!-- ##api level indication## -->
+<dt>introduced in:</dt>
+<dd>API Level 1</dd>
+
 </dl>
diff --git a/docs/html/guide/topics/manifest/uses-configuration-element.jd b/docs/html/guide/topics/manifest/uses-configuration-element.jd
new file mode 100755
index 000000000000..b26881e1f084
--- /dev/null
+++ b/docs/html/guide/topics/manifest/uses-configuration-element.jd
@@ -0,0 +1,176 @@
+page.title=&lt;uses-configuration&gt;
+@jd:body
+
+<!-- ##api level 3##  see comment below -->
+
+<!-- the "no___" values are nonsensical if they mean "doesn't work on devices with a
+keyboard / navigation control / touch screen."  Dianne says that that's what they mean and 
+that they therefore should be eliminated.  Suchi says that they mean "doesn't require a 
+keyboard / navigation control / touch screen to work."  But then what does "undefined" mean?
+Seems like some API change is in the works, either eliminating the "no___" values or
+"undefined".  Since it's unclear what the change will be, I've chosen to document the "no___" 
+and "undefined" attributes using the same language, which is surely wrong but may make it
+easier to update the doc when the change is made. -->
+
+<dl class="xml">
+<dt>syntax:</dt>
+<dd><pre class="stx">&lt;uses-configuration android:<a href="#five">reqFiveWayNav</a>=["true" | "false"] 
+                    android:<a href="#hard">reqHardKeyboard</a>=["true" | "false"]
+                    android:<a href="#kbd">reqKeyboardType</a>=["undefined" | "nokeys" | "qwerty" |  
+                                             "twelvekey"]
+                    android:<a href="#nav">reqNavigation</a>=["undefined" | "nonav" | "dpad" | 
+                                           "trackball" | "wheel"]
+                    android:<a href="#touch">reqTouchScreen</a>=["undefined" | "notouch" | "stylus" | 
+                                            "finger"] /&gt;</pre></dd>
+
+<dt>contained in:</dt>
+<dd><code><a href="{@docRoot}guide/topics/manifest/manifest-element.html">&lt;manifest&gt;</a></code></dd>
+
+<dt>description:</dt>
+<dd>Indicates what hardware and software features the application requires.  
+For example, an application might specify that it requires a physical keyboard 
+or a particular navigation device, like a trackball.  The specification is
+used to avoid installing the application on devices where it will not work.
+
+<p>
+If an application can work with different device configurations, it 
+should include separate {@code &lt;uses-configuration&gt;} declarations for 
+each one.  Each declaration must be complete.  For example, if an application 
+requires a five-way navigation control, a touch screen that can be operated 
+with a finger, and either a standard QWERTY keyboard or a numeric 12-key
+keypad like those found on most phones, it would specify these requirements
+with two {@code &lt;uses-configuration&gt;} elements as follows:
+</p>
+
+<pre>&lt;uses-configuration android:reqFiveWayNav="true" android:reqTouchScreen="finger"
+                    android:reqKeyboardType="qwerty" /&gt;
+&lt;uses-configuration android:reqFiveWayNav="true" android:reqTouchScreen="finger"
+                    android:reqKeyboardType="twelvekey" /&gt;</pre></dd>
+
+<dt>attributes:</dt>
+<dd><dl class="attr">
+<dt><a name="five"></a>{@code android:reqFiveWayNav}</dt>
+<dd>Whether or not the application requires a five-way navigation control 
+&mdash; "{@code true}" if it does, and "{@code false}" if not.  A five-way
+control is one that can move the selection up, down, right, or left, and 
+also provides a way of invoking the current selection.  It could be a 
+D-pad (directional pad), trackball, or other device.  
+
+<p>
+If an application requires a directional control, but not a control of a
+particular type, it can set this attribute to "{@code true}" and ignore 
+the <code><a href="#nav">reqNavigation</a></code> attribute.  However,
+if it requires a particular type of directional control, it can ignore
+this attribute and set {@code reqNavigation} instead.
+</p></dd>
+
+<dt><a name="hard"></a>{@code android:reqHardKeyboard}</dt>
+<dd>Whether or not the application requires a hardware keyboard &mdash;
+"{@code true}" if it does, and "{@code false}" if not.</dd>
+
+<dt><a name="kbd"></a>{@code android:reqKeyboardType}</dt>
+<dd>The type of keyboard the application requires, if any at all. 
+This attribute does not distinguish between hardware and software 
+keyboards.  If a hardware keyboard of a certain type is required,
+specify the type here and also set the {@code reqHardKeyboard} attribute 
+to "{@code true}".
+
+<p>
+The value must be one of the following strings:
+</p>
+
+<table>
+<tr>
+   <th>Value</th>
+   <th>Description</th>
+</tr><tr>
+   <td>"{@code undefined}"</td>
+   <td>The application does not require a keyboard. 
+       (A keyboard requirement is not defined.)  
+       This is the default value.</td>
+</tr><tr>
+   <td>"{@code nokeys}"</td>
+   <td>The application does not require a keyboard.</td>
+</tr><tr>
+   <td>"{@code qwerty}"</td>
+   <td>The application requires a standard QWERTY keyboard.</td>
+</tr><tr>
+   <td>"{@code twelvekey}"</td>
+   <td>The application requires a twelve-key keypad, like those on most 
+       phones &mdash; with keys for the digits from {@code 0} through 
+       {@code 9} plus star ({@code *}) and pound ({@code #}) keys.</td>
+</tr>
+</table></dd>
+
+<dt><a name="nav"></a>{@code android:reqNavigation}</dt>
+<dd>The navigation device required by the application, if any.  The value 
+must be one of the following strings:
+
+<table>
+<tr>
+   <th>Value</th>
+   <th>Description</th>
+</tr><tr>
+   <td>"{@code undefined}"</td>
+   <td>The application does not require any type of navigation control. 
+       (The navigation requirement is not defined.)  
+       This is the default value.</td>
+</tr><tr>
+   <td>"{@code nonav}"</td>
+   <td>The application does not require a navigation control.</td>
+</tr><tr>
+   <td>"{@code dpad}"</td>
+   <td>The application requires a D-pad (directional pad) for navigation.</td>
+</tr><tr>
+   <td>"{@code trackball}"</td>
+   <td>The application requires a trackball for navigation.</td>
+</tr><tr>
+   <td>"{@code wheel}"</td>
+   <td>The application requires a navigation wheel.</td>
+</tr>
+</table>
+
+<p>
+If an application requires a navigational control, but the exact type of
+control doesn't matter, it can set the 
+<code><a href="#five">reqFiveWayNav</a></code> attribute to "{@code true}"
+rather than set this one.
+</p></dd>
+
+<dt><a name="touch"></a>{@code android:reqTouchScreen}</dt>
+<dd>The type of touch screen the application requires, if any at all.
+The value must be one of the following strings: 
+
+<table>
+<tr>
+   <th>Value</th>
+   <th>Description</th>
+</tr><tr>
+   <td>"{@code undefined}"</td>
+   <td>The application doesn't require a touch screen.  
+       (The touch screen requirement is undefined.)
+       This is the default value.</td>
+</tr><tr>
+   <td>"{@code notouch}"</td>
+   <td>The application doesn't require a touch screen.</td>
+</tr><tr>
+   <td>"{@code stylus}"</td>
+   <td>The application requires a touch screen that's operated with a stylus.</td>
+</tr><tr>
+   <td>"{@code finger}"</td>
+   <td>The application requires a touch screen that can be operated with a finger.</td>
+</tr>
+</table></dd>
+</dl></dd>
+
+<!-- ##api level 3## -->
+<dt>introduced in:</dt>
+<dd>API Level 3</dd>
+
+<dt>see also:</dt>
+<dd><code><a href="{@docRoot}guide/topics/manifest/activity-element.html#config">configChanges</a></code>
+attribute of the
+<code><a href="{@docRoot}guide/topics/manifest/activity-element.html">&lt;activity&gt;</a></code> 
+element</dd>
+
+</dl>
diff --git a/docs/html/guide/topics/manifest/uses-library-element.jd b/docs/html/guide/topics/manifest/uses-library-element.jd
index d66da2c79225..f1b5e70ff7ec 100644
--- a/docs/html/guide/topics/manifest/uses-library-element.jd
+++ b/docs/html/guide/topics/manifest/uses-library-element.jd
@@ -29,4 +29,8 @@ contains the package code.
 <dd>The name of the library.</dd>
 </dl></dd>
 
+<!-- ##api level indication## -->
+<dt>introduced in:</dt>
+<dd>API Level 1</dd>
+
 </dl>
diff --git a/docs/html/guide/topics/manifest/uses-permission-element.jd b/docs/html/guide/topics/manifest/uses-permission-element.jd
index 07741b15d1e0..aec765ca6969 100644
--- a/docs/html/guide/topics/manifest/uses-permission-element.jd
+++ b/docs/html/guide/topics/manifest/uses-permission-element.jd
@@ -33,6 +33,10 @@ a permission name typically includes the package name as a prefix.</dd>
 
 </dl></dd>
 
+<!-- ##api level indication## -->
+<dt>introduced in:</dt>
+<dd>API Level 1</dd>
+
 <dt>see also:</dt>
 <dd><code><a href="{@docRoot}guide/topics/manifest/permission-element.html">&lt;permission&gt;</a></code></dd>
 
diff --git a/docs/html/guide/topics/manifest/uses-sdk-element.jd b/docs/html/guide/topics/manifest/uses-sdk-element.jd
index a88635a3c174..b6e73746cfd6 100644
--- a/docs/html/guide/topics/manifest/uses-sdk-element.jd
+++ b/docs/html/guide/topics/manifest/uses-sdk-element.jd
@@ -9,10 +9,10 @@ page.title=&lt;uses-sdk&gt;
 <dd><code><a href="{@docRoot}guide/topics/manifest/manifest-element.html">&lt;manifest&gt;</a></code></dd>
 
 <dt>description:</dt>
-<dd>Declares which levels of the Android API the application can run against.  
-The level is incremented when there are additions to the API and resource tree, 
-so an application developed using level 3 of the API may not run against level 
-1 or 2, but should run against level 3, 4, 5, and above.
+<dd>Lets you express an application's compatibility with one or more versions of the Android platform,
+by means of an API Level integer. The API Level expressed by an application will be compared to the
+API Level of a given Android system, which may vary among different Android devices. To declare your
+application's minimum API Level compatibility, use the <a href="#min">minSdkVersion</a> attribute.
 </p>
 
 <p>
@@ -35,15 +35,31 @@ Applications</a>.
 for the application to run.
 
 <p>
-Despite its name, this attribute is set to the API level, <em>not</em> to the 
-version number of the SDK (software development kit).  The API level is always 
+Despite its name, this attribute specifies the API Level, <em>not</em> the 
+version number of the SDK (software development kit).  The API Level is always 
 a single integer; the SDK version may be split into major and minor components 
-(such as 1.2).  You cannot derive the API level from the SDK version number 
+(such as 1.5).  You cannot derive the API Level from the SDK version number 
 (for example, it is not the same as the major version or the sum of the major 
-and minor versions).  To learn what the API level is, check the notes that 
-came with the SDK you're using.
-</p></dd>
+and minor versions).  To learn what the API Level is, check the notes that 
+came with the SDK you're using.</p>
+
+<p>Prior to installing an application, the Android system checks the value of this
+attribute and allows the installation only if the
+API Level is less than or equal to the API Level used by the system itself.</p>
+
+<p>If you do not declare this attribute, then a value of "1" is assumed, which
+indicates that your application is compatible with all versions of Android. If your
+application is <em>not</em> universally compatible (for instance if it uses APIs
+introduced in Android 1.5) and you have not declared the proper <code>minSdkVersion</code>, 
+then when installed on a system with a lower API Level, the application 
+will crash during runtime. For this reason, be certain to declare the appropriate API Level
+in the <code>minSdkVersion</code> attribute.</p>
+</dd>
 
 </dl></dd>
 
+<!-- ##api level indication## -->
+<dt>introduced in:</dt>
+<dd>API Level 1</dd>
+
 </dl>
diff --git a/docs/html/guide/topics/media/index.jd b/docs/html/guide/topics/media/index.jd
index ba6d89f675cc..fd7d2da021d8 100644
--- a/docs/html/guide/topics/media/index.jd
+++ b/docs/html/guide/topics/media/index.jd
@@ -9,7 +9,7 @@ page.title=Audio and Video
 <li>Audio playback and record</li>
 <li>Video playback</li>
 <li>Handles data from raw resources, files, streams</li>
-<li>Built-in codecs for a variety of media. See <a href="{@docRoot}guide/appendix/media-formats.html">Android 1.0 Media Formats</a></li>
+<li>Built-in codecs for a variety of media. See <a href="{@docRoot}guide/appendix/media-formats.html">Android Supported Media Formats</a></li>
 </ul>
 
 <h2>Key classes</h2>
@@ -44,14 +44,13 @@ can play audio or video from media files stored in the application's resources
 arriving over a network connection. To play audio or video from your
 application, use the {@link android.media.MediaPlayer} class.</p>
 
-<p>The platform also lets you record audio, where supported by the mobile device
-hardware. Recording of video is not currently supported, but is planned for a
-future release. To record audio, use the 
-{@link android.media.MediaRecorder} class. Note that the emulator doesn't have
-hardware to capture audio, but actual mobile devices are likely to provide these
-capabilities that you can access through MediaRecorder. </p>
+<p>The platform also lets you record audio and video, where supported by the
+mobile device hardware. To record audio or video, use the {@link
+android.media.MediaRecorder} class. Note that the emulator doesn't have hardware
+to capture audio or video, but actual mobile devices are likely to provide these
+capabilities, accessible through the MediaRecorder class. </p>
 
-<p>For a list of the media formats for which Android offers built-in support,
+<p>For a list of media formats for which Android offers built-in support,
 see the <a href="{@docRoot}guide/appendix/media-formats.html">Android Media
 Formats</a> appendix. </p>
 
diff --git a/docs/html/guide/topics/media/media.jd b/docs/html/guide/topics/media/media.jd
deleted file mode 100644
index 463686d367ae..000000000000
--- a/docs/html/guide/topics/media/media.jd
+++ /dev/null
@@ -1,172 +0,0 @@
-page.title=Media Capabilities
-@jd:body
-
-<div class="sidebox">
-
-<h3>Media Quickview</h3>
-
-<h4>Built-in capabilities</h4>
-<ul>
-<li>Audio playback and record</li>
-<li>Video playback</li>
-</ul>
-
-<h4>Data sources</h4>
-<ul>
-<li>Raw resources</li>
-<li>Data files</li>
-<li>Streams</li>
-</ul>
-
-<h4>Media Formats</h4>
-<ul>
-<li>See appendix <a href="{@docRoot}devguide/appendix/media_formats.html">Android 1.0 Media Formats</a></li>
-</ul>
-
-<h4>Key APIs</h4>
-<ul>
-<li>{@link android.media.MediaPlayer} (playback, all audio and video formats)</li>
-<li>{@link android.media.MediaRecorder} (record, all audio formats)</li>
-</ul>
-</div>
-
-<p>The Android platform offers built-in encoding/decoding for a variety of common media types, 
-so that you can easily integrate audio, video, and images into your applications. Accessing the platform's media 
-capabilities is fairly straightforward &mdash you do so using the same intents and
-activities mechanism that the rest of Android uses.</p>
-
-<p>Android lets you play audio and video from several types of data sources. You can play audio or video from media files stored in the application's resources (raw resources), from standalone files in the filesystem, or from a data stream arriving over a network connection. To play audio or video from your application, use the {@link android.media.MediaPlayer} class.</p>
-
-<p>The platform also lets you record audio, where supported by the mobile device hardware. Recording of video is not currently supported, but is planned for a future release. To record audio, use the 
-{@link android.media.MediaRecorder} class. Note that the emulator doesn't have hardware to capture audio, but actual mobile devices are likely to provide these capabilities that you can access through MediaRecorder. </p>
-
-<p>For a list of the media formats for which Android offers built-in support, see the <a href="{@docRoot}devguide/appendix/media_formats.html">Android Media Formats</a> appendix. </p>
-
-<h2>Playing Audio and Video</h2>
-<p>Media can be played from anywhere: from a raw resource, from a file from the system, 
-or from an available network (URL).</p>
-  
-<p>You can play back the audio data only to the standard
-output device; currently, that is the mobile device speaker or Bluetooth headset. You
-cannot play sound files in the conversation audio. </p>
-
-<h3>Playing from a Raw Resource</h3>
-<p>Perhaps the most common thing to want to do is play back media (notably sound)
-within your own applications. Doing this is easy:</p>
-<ol>
-  <li>Put the sound (or other media resource) file into the <code>res/raw</code>
-  folder of your project, where the Eclipse plugin (or aapt) will find it and
-  make it into a resource that can be referenced from your R class</li>
-  <li>Create an instance of <code>MediaPlayer</code>, referencing that resource using
-  {@link android.media.MediaPlayer#create MediaPlayer.create}, and then call
-  {@link android.media.MediaPlayer#start() start()} on the instance:<br><br></li>
-</ol>
-<pre>
-    MediaPlayer mp = MediaPlayer.create(context, R.raw.sound_file_1);
-    mp.start();
-</pre>
-<p>To stop playback, call {@link android.media.MediaPlayer#stop() stop()}. If 
-you wish to later replay the media, then you must 
-{@link android.media.MediaPlayer#reset() reset()} and
-{@link android.media.MediaPlayer#prepare() prepare()} the MediaPlayer object
-before calling {@link android.media.MediaPlayer#start() start()} again. 
-(<code>create()</code> calls <code>prepare()</code> the first time.)</p>
-<p>To pause playback, call {@link android.media.MediaPlayer#pause() pause()}. 
-Resume playback from where you paused with 
-{@link android.media.MediaPlayer#start() start()}.</p>
-
-<h3>Playing from a File or Stream</h3>
-<p>You can play back media files from the filesystem or a web URL:</p>
-<ol>
-  <li>Create an instance of the <code>MediaPlayer</code> using <code>new</code></li>
-  <li>Call {@link android.media.MediaPlayer#setDataSource setDataSource()}
-    with a String containing the path (local filesystem or URL)
-    to the file you want to play</li>
-  <li>First {@link android.media.MediaPlayer#prepare prepare()} then
-  {@link android.media.MediaPlayer#start() start()} on the instance:<br><br></li>
-</ol>
-<pre>
-    MediaPlayer mp = new MediaPlayer();
-    mp.setDataSource(PATH_TO_FILE);
-    mp.prepare();
-    mp.start();
-</pre>
-<p>{@link android.media.MediaPlayer#stop() stop()} and 
-{@link android.media.MediaPlayer#pause() pause()} work the same as discussed
-above.</p>
-  <p class="note"><strong>Note:</strong> It is possible that <code>mp</code> could be
-  null, so good code should <code>null</code> check after the <code>new</code>.
-  Also, <code>IllegalArgumentException</code> and <code>IOException</code> either
-  need to be caught or passed on when using <code>setDataSource()</code>, since
-  the file you are referencing may not exist.</p>
-<p class="note"><strong>Note:</strong>
-If you're passing a URL to an online media file, the file must be capable of 
-progressive download.</p>
-
-<h2>Recording Media Resources</h2>
-<p>Recording media is a little more involved than playing it back, as you would
-probably expect, but it is still fairly simple. There is just a little more set
-up to do</p>
-<ol>
-  <li>Create a new instance of {@link android.media.MediaRecorder 
-  android.media.MediaRecorder} using <code>new</code></li>
-  <li>Create a new instance of {@link android.content.ContentValues 
-  android.content.ContentValues} and put in some standard properties like
-  <code>TITLE</code>, <code>TIMESTAMP</code>, and the all important 
-  <code>MIME_TYPE</code></li>
-  <li>Create a file path for the data to go to (you can use {@link
-  android.content.ContentResolver android.content.ContentResolver} to
-  create an entry in the Content database and get it to assign a path
-  automatically which you can then use)</li>
-  <li>Set the audio source using {@link android.media.MediaRecorder#setAudioSource
-  MediaRecorder.setAudioSource()}. You will probably want to use
-  <code>MediaRecorder.AudioSource.MIC</code></li>
-  <li>Set output file format using {@link 
-        android.media.MediaRecorder#setOutputFormat MediaRecorder.setOutputFormat()}
-  </li>
-  <li>Set the audio encoder using 
-        {@link android.media.MediaRecorder#setAudioEncoder MediaRecorder.setAudioEncoder()}
-  </li>
-  <li>Finally, {@link android.media.MediaRecorder#prepare prepare()} and
-  {@link android.media.MediaRecorder#start start()} the recording.
-  {@link android.media.MediaRecorder#stop stop()} and
-  {@link android.media.MediaRecorder#release release()} when you are done</li>
-</ol>
-<p>Here is a code example that will hopefully help fill in the gaps:</p>
-<p><strong>Start Recording</strong></p>
-<pre>
-    recorder = new MediaRecorder();
-    ContentValues values = new ContentValues(3);
-
-    values.put(MediaStore.MediaColumns.TITLE, SOME_NAME_HERE);
-    values.put(MediaStore.MediaColumns.TIMESTAMP, System.currentTimeMillis());
-    values.put(MediaStore.MediaColumns.MIME_TYPE, recorder.getMimeContentType());
-    
-    ContentResolver contentResolver = new ContentResolver();
-    
-    Uri base = MediaStore.Audio.INTERNAL_CONTENT_URI;
-    Uri newUri = contentResolver.insert(base, values);
-    
-    if (newUri == null) {
-        // need to handle exception here - we were not able to create a new
-        // content entry
-    }
-    
-    String path = contentResolver.getDataFilePath(newUri);
-
-    // could use setPreviewDisplay() to display a preview to suitable View here
-    
-    recorder.setAudioSource(MediaRecorder.AudioSource.MIC);
-    recorder.setOutputFormat(MediaRecorder.OutputFormat.THREE_GPP);
-    recorder.setAudioEncoder(MediaRecorder.AudioEncoder.AMR_NB);
-    recorder.setOutputFile(path);
-    
-    recorder.prepare();
-    recorder.start();
-</pre>
-<p><strong>Stop Recording</strong></p>
-<pre>
-    recorder.stop();
-    recorder.release();
-</pre>
-
diff --git a/docs/html/guide/tutorials/hello-android.jd b/docs/html/guide/tutorials/hello-android.jd
deleted file mode 100644
index c37d6f95e5f5..000000000000
--- a/docs/html/guide/tutorials/hello-android.jd
+++ /dev/null
@@ -1,473 +0,0 @@
-page.title=Hello, Android!
-@jd:body
-
-<p>First impressions matter, and as a developer you know that the first impression
-you get of a development framework is how easy it is to write "Hello,
-World!" Well, in Android, it's pretty easy. Here's how it looks:</p>
-
-<ul>
-  <li><a href="#create">Create the Project</a></li>
-  <li><a href="#ui">Construct the UI</a></li>
-  <li><a href="#run">Run the Code: Hello, Android</a></li>
-</ul>
-
-<p>The sections below spell it all out in detail. </p>
-
-<ul>
-  <li><a href="#upgrading">Upgrading the UI to an XML Layout</a> </li>
-  <li><a href="#debugging">Debugging Your Project</a> </li>
-  <li><a href="#noeclipse">Creating a Project without Eclipse</a> </li>
-</ul>
-<p>Let's jump in!</p>
-
-<a name="create"></a>
-
-<h2>Create the Project </h2>
-
-<p>Creating the project is as simple as can be. An Eclipse
-plugin is available making Android development a snap. </p>
-
-<p>You'll need to have a development computer with the Eclipse IDE installed (see <a
-href="{@docRoot}intro/installing.html#developmentrequirements">System and Software Requirements</a>), and
-you'll need to install the <a 
-href="{@docRoot}intro/installing.html#installingplugin">Android Eclipse Plugin (ADT)</a>. Once you have those ready, come back here. </p>
-
-<p>First, here's a high-level summary of how to build "Hello, World!":</p>
-
-<ol>
-  <li>
-    Create a new "Android Project" via the <strong>File &gt; New &gt; Project</strong> menu.
-  </li>
-  <li>
-    Fill out the project details in the New Android Project dialog.
-  </li>
-  <li>
-    Edit the auto-generated source code template to display some output.
-  </li>
-</ol>
-<p> That's it! Next, let's go through each step above in detail. </p>
-<ol class="listhead">
-    <li>Create a new Android Project
-        <p>From Eclipse, select the <strong>File &gt; New &gt; Project</strong> menu item. If the Android
-            Plugin for Eclipse has been successfully installed, the resulting dialog
-            should have a folder labeled "Android" which should contain a single entry:
-            "Android Project".</p>
-            
-            <p><img src="{@docRoot}images/hello_world_0.png"/></p>
-
-            <p>Once you've selected "Android Project", click the Next button.</p>
-    </li>
-
-    <li>Fill out the project details
-        <p>The next screen allows you to enter the relevant details for your project.
-        Here's an example:</p>
-
-        <p><img src="{@docRoot}images/hello_world_1.png"/></p>
-
-        <p>Here's what each field on this screen means:</p>
-
-    
-  <table>
-      <tbody>
-        <tr>
-            <td>Project Name </td>
-            <td>This is the name of the directory or folder on your computer that you
-                want to contain the project.</td>
-        </tr>
-        <tr>
-            <td>Package Name </td>
-            <td>This is the package namespace (following the same rules as for
-            packages in the Java programming language) that you want all your source code to
-            reside under. This also sets the package name under which the stub
-            Activity will be generated.<p/>
-            The package name you use in your application must be unique across
-            all packages installed on the system;  for this reason, it's very
-            important to use a standard domain-style package for your
-            applications.  In the example above, we used the
-            package domain "com.android"; you should use a
-            different one appropriate to your organization.</td>
-        </tr>
-        <tr>
-            <td>Activity Name </td>
-            <td>This is the name for the class stub that will be generated by the plugin.
-                This will be a subclass of Android's Activity class.  An Activity is simply a
-                class that can run and do work. It can create a UI if it chooses, but it
-                doesn't need to. </td>
-        </tr>
-        <tr>
-            <td> Application Name </td>
-            <td> This is the human-readable title for your application. </td>
-        </tr>
-    </tbody>
-  </table>
-
-<p>The checkbox for toggling "Use default location" allows you to change the
-location on disk where the project's files will be generated and stored.</p>
-</li>
-
-<li>Edit the auto-generated source code
-
-<p>After the plugin runs, you'll have a class named HelloAndroid 
-(found in your package, HelloAndroid > src > com.android.hello). It should look like
-this:</p>
-
-<pre>public class HelloAndroid extends Activity {
-    /** Called when the activity is first created. */
-    &#64;Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.main);
-    }
-}</pre>
-
-<p>Now, you <em>could</em> run this right away, but let's go a little further, 
-so we understand more about what's happening.
-So, the next step is to modify some code! </p>
-</li>
-</ol>
-
-<a name="ui"></a>
-
-<h2>Construct the UI</h2>
-
-<p>Take a look at this revised code, below, and make the same changes to your HelloAndroid.java file. We'll dissect
-it line by line:</p>
-
-<pre>
-package com.android.hello;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.widget.TextView;
-
-public class HelloAndroid extends Activity {
-   /** Called when the activity is first created. */
-   &#64;Override
-   public void onCreate(Bundle savedInstanceState) {
-       super.onCreate(savedInstanceState);
-       TextView tv = new TextView(this);
-       tv.setText(&quot;Hello, Android&quot;);
-       setContentView(tv);
-   }
-}</pre>
-
-<p class="note"><strong>Tip:</strong> If you forgot to import the TextView package, try this:
-press <strong>Ctrl-Shift-O</strong> (<strong>Cmd-Shift-O</strong>, on Mac). This is an Eclipse 
-shortcut to organize imports&mdash;it identifies missing packages and adds them for you.</p>
-
-<p>In Android, user interfaces are composed of hierarchies of classes called
-Views. A View is simply a drawable object, such as a radio button, an
-animation, or (in our case) a text label. The specific name for the View
-subclass that handles text is simply TextView.</p>
-
-<p>Here's how you construct a TextView:</p>
-
-<pre>TextView tv = new TextView(this);</pre>
-
-<p>The argument to TextView's constructor is an Android Context instance. The
-Context is simply a handle to the system; it provides services like
-resolving resources, obtaining access to databases and preferences, and so
-on. The Activity class inherits from Context.  Since our
-HelloAndroid class is a subclass of Activity, it is also a Context, and so we can
-pass the <code>this</code> reference to the TextView.</p>
-
-<p>Once we've constructed the TextView, we need to tell it what to display:</p>
-
-<pre>tv.setText(&quot;Hello, Android&quot;);</pre>
-
-<p>Nothing too surprising there.</p>
-
-<p>At this point, we've constructed a TextView and told it what text to
-display. The final step is to connect this TextView with the on-screen
-display, like so:</p>
-
-<pre>setContentView(tv);</pre>
-
-<p>The <code>setContentView()</code> method on Activity indicates to the system which
-View should be associated with the Activity's UI. If an Activity doesn't
-call this method, no UI is present at all and the system will display a blank
-screen. For our purposes, all we want is to display some text, so we pass it
-the TextView we just created.</p>
-
-<p>There it is &mdash; "Hello, World" in Android! The next step, of course, is
-to see it running.</p>
-
-<a name="run"></a>
-
-<h2>Run the Code: Hello, Android</h2>
-
-<p>The Eclipse plugin makes it very easy to run your applications. Begin by
-selecting the <strong>Run &gt; Open Run Dialog</strong> menu entry (in Eclipse 3.4, it's 
-<strong>Run > Run Configurations</strong>). You should see a dialog
-like this:</p>
-
-<div id="o.:l" style="PADDING:1em 0pt; TEXT-ALIGN:left">
-  <img src="{@docRoot}images/hello_world_2.png"/>
-</div>
-
-<p>Next, highlight the "Android Application" entry, and then click the icon in the
-top left corner (the one depicting a sheet of paper with a plus sign in the
-corner) or simply double-click the "Android Application" entry. You should
-have a new launcher entry named "New_configuration".</p>
-
-<div id="z4_b" style="PADDING:1em 0pt; TEXT-ALIGN:left">
-  <img src="{@docRoot}images/hello_world_3.png"/>
-</div>
-
-<p>Change the name to something expressive, like "Hello, Android", and then pick
-your project by clicking the Browse button. (If you have more than one
-Android project open in Eclipse, be sure to pick the right one.) The
-plugin will automatically scan your project for Activity subclasses, and add
-each one it finds to the drop-down list under the "Activity:" label. Since
-your "Hello, Android" project only has one, it will be the default, and you can
-simply continue.</p>
-
-<p>Click the "Apply" button. Here's an example:</p>
-
-<div id="t66_" style="PADDING:1em 0pt; TEXT-ALIGN:left">
-  <img src="{@docRoot}images/hello_world_4.png"/>
-</div>
-
-<p>That's it &mdash; you're done! Click the Run button, and the Android Emulator
-should start.  Once it's booted up your application will appear.  When all is said and done, you should
-see something like this:</p>
-
-<div id="qnhl" style="PADDING:1em 0pt; TEXT-ALIGN:left">
-  <img src="{@docRoot}images/hello_world_5.png"/>
-</div>
-
-<p>That's "Hello, World" in Android. Pretty straightforward, eh?
-The next sections of the tutorial offer more detailed information that you may find valuable as you
-learn more about Android.</p>
-
-<a name="upgrading"></a>
-
-<h2>Upgrading the UI to an XML Layout</h2>
-
-<p>The "Hello, World" example you just completed uses what we call "programmatic"
-UI layout. This means that you construct and build your application's UI
-directly in source code. If you've done much UI programming, you're
-probably familiar with how brittle that approach can sometimes be: small
-changes in layout can result in big source-code headaches. It's also very
-easy to forget to properly connect Views together, which can result in errors in
-your layout and wasted time debugging your code.</p>
-
-<p>That's why Android provides an alternate UI construction model: XML-based
-layout files. The easiest way to explain this concept is to show an
-example. Here's an XML layout file that is identical in behavior to the
-programmatically-constructed example you just completed:</p>
-
-<pre>&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;
-&lt;TextView xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;
-  android:layout_width=&quot;fill_parent&quot;
-  android:layout_height=&quot;fill_parent&quot;
-  android:text=&quot;Hello, Android&quot;/&gt;</pre>
-
-<p>The general structure of an Android XML layout file is simple.  It's a tree
-of tags, where each tag is the name of a View class. In this example, it's
-a very simple tree of one element, a TextView. You can use the
-name of any class that extends View as a tag name in your XML layouts,
-including custom View classes you define in your own code. This
-structure makes it very easy to quickly build up UIs, using a much simpler
-structure and syntax than you would in source code. This model is inspired
-by the web development model, where you can separate the presentation of your
-application (its UI) from the application logic used to fetch and fill in data.</p>
-
-<p>In this example, there are also four XML attributes.  Here's a summary of what
-they mean:</p>
-
-<table>
-    <tbody>
-        <tr>
-            <th>
-                Attribute
-            </th>
-            <th>
-                Meaning
-            </th>
-        </tr>
-        <tr>
-            <td>
-                <code>xmlns:android</code>
-            </td>
-            <td>
-                This is an XML namespace declaration that tells the Android tools that you are going to refer to common attributes defined in the Android namespace. The outermost tag in every Android layout file must have this attribute.<br>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <code>android:layout_width</code>
-            </td>
-            <td>
-                This attribute defines how much of the available width on the screen this View should consume. In this case, it's our only View so we want it to take up the entire screen, which is what a value of "fill_parent" means.<br>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <code>android:layout_height</code>
-            </td>
-            <td>
-                This is just like android:layout_width, except that it refers to available screen height.
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <code>android:text</code>
-            </td>
-            <td>
-                This sets the text that the TextView should contain. In this example, it's our usual "Hello, Android" message.
-            </td>
-        </tr>
-    </tbody>
-</table>
-
-
-<p>So, that's what the XML layout looks like, but where do you put it?  Under the /res/layout directory in your project. The "res" is
-short for "resources" and that directory contains all the non-code assets that
-your application requires. This includes things like images, localized
-strings, and XML layout files.</p>
-
-<p>The Eclipse plugin creates one of these XML files for you.  In our example
-above, we simply never used it.  In the Package Explorer, expand the
-folder /res/layout, and edit the file main.xml.  Replace its contents with
-the text above and save your changes.</p>
-
-<p>Now open the file named R.java in your source code folder in the Package
-Explorer. You'll see that it now looks something like this:</p>
-
-<pre>
-public final class R {
-    public static final class attr {
-    };
-    public static final class drawable {
-        public static final int icon=0x7f020000;
-    };
-    public static final class layout {
-        public static final int main=0x7f030000;
-    };
-    public static final class string {
-        public static final int app_name=0x7f040000;
-    };
-};
-</pre>
-
-<p>A project's R.java file is an index into all the resources defined in the
-file. You use this class in your source code as a sort of short-hand
-way to refer to resources you've included in your project. This is
-particularly powerful with the code-completion features of IDEs like Eclipse 
-because it lets you quickly and interactively locate the specific reference
-you're looking for.</p>
-
-<p>The important thing to notice for now is the inner class named "layout", and its
-member field "main". The Eclipse plugin noticed that you added a new XML
-layout file and then regenerated this R.java file.  As you add other
-resources to your projects you'll see R.java change to keep up.</p>
-
-<p>The last thing you need to do is modify your HelloAndroid source code to use the new
-XML version of your UI, instead of the hard-coded version. Here's what
-your new class will look like.  As you can see, the source code becomes much
-simpler:</p>
-
-<pre>package com.android.hello;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-public class HelloAndroid extends Activity {
-    /** Called when the activity is first created. */
-    &#64;Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.main);
-    }
-}</pre>
-
-<p>When you make this change, don't just copy-and-paste it in. Try out the code-completion feature on that R class. You'll probably find that it helps a lot.</p>
-
-<p>Now that you've made this change, go ahead and re-run your application &mdash; all
-you need to do is click the green Run arrow icon, or select 
-<strong>Run &gt; Run History &gt; Hello, Android</strong>  from the menu. You should see.... well, exactly the same thing
-you saw before! After all, the point was to show that the two different
-layout approaches produce identical results.</p>
-
-<p>There's a lot more to creating these XML layouts, but that's as far as we'll go
-here. Read the <a
-href="{@docRoot}devel/implementing-ui.html">Implementing a User Interface</a> documentation for more 
-information on the power of this approach.</p>
-
-<a name="debugging"></a>
-
-<h2>Debugging Your Project</h2>
-
-<p>The Android Plugin for Eclipse also has excellent integration with the Eclipse
-debugger. To demonstrate this, let's introduce a bug into
-our code. Change your HelloAndroid source code to look like this:</p>
-
-<pre>
-package com.android.hello;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-public class HelloAndroid extends Activity {
-    /** Called when the activity is first created. */
-    &#64;Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        Object o = null;
-        o.toString();
-        setContentView(R.layout.main);
-    }
-}</pre>
-
-<p>This change simply introduces a NullPointerException into your code. If
-you run your application again, you'll eventually see this:</p>
-
-<div id="go-9" style="PADDING:1em 0pt; TEXT-ALIGN:left">
-  <img src="{@docRoot}images/hello_world_8.png"/>
-</div>
-
-<p>Press "Force Quit" to terminate the application and close the emulator window.</p>
-
-<p>To find out more about the error, set a breakpoint in your source code 
-on the line <code>Object o = null;</code> (double-click on the marker bar next to the source code line). Then select <strong>Run &gt; Debug History &gt; Hello, 
-Android</strong> from the menu to enter debug mode. Your app will restart in the 
-emulator, but this time it will suspend when it reaches the breakpoint you
-set. You can then step through the code in Eclipse's Debug Perspective,
-just as you would for any other application.</p>
-
-<div id="w2c9" style="PADDING:1em 0pt; TEXT-ALIGN:left">
-  <img src="{@docRoot}images/hello_world_9.png"/>
-</div>
-
-<a name="noeclipse"></a>
-
-<h2>Creating the Project without Eclipse</h2>
-
-<p>If you don't use Eclipse (such as if you prefer another IDE, or simply use text
-editors and command line tools) then the Eclipse plugin can't help you.
-Don't worry though &mdash; you don't lose any functionality just because you don't
-use Eclipse.</p>
-
-<p>The Android Plugin for Eclipse is really just a wrapper around a set of tools
-included with the Android SDK. (These tools, like the emulator, aapt, adb,
-ddms, and others are <a href="tools.html">documented elsewhere.</a>) Thus, it's possible to
-wrap those tools with another tool, such as an 'ant' build file.</p>
-
-<p>The Android SDK includes a Python script named "activitycreator.py" that can be
-used to create all the source code and directory stubs for your project, as well
-as an ant-compatible build.xml file. This allows you to build your project
-from the command line, or integrate it with the IDE of your choice.</p>
-
-<p>For example, to create a HelloAndroid project similar to the one we just created
-via Eclipse, you'd use this command:</p>
-
-<pre>activitycreator.py --out HelloAndroid com.android.hello.HelloAndroid</pre>
-
-<p>To build the project, you'd then run the command 'ant'. When that command
-successfully completes, you'll be left with a file named HelloAndroid.apk under
-the 'bin' directory. That .apk file is an Android Package, and can be
-installed and run in your emulator using the 'adb' tool.</p>
-
-<p>For more information on how to use these tools, please read the documentation
-cited above.</p>
diff --git a/docs/html/guide/tutorials/hello-world.jd b/docs/html/guide/tutorials/hello-world.jd
index 7dbfd3f6aab3..f277b10fd552 100644
--- a/docs/html/guide/tutorials/hello-world.jd
+++ b/docs/html/guide/tutorials/hello-world.jd
@@ -124,7 +124,7 @@ documentation.</p>
 com.example.helloandroid</em>). It should look like this:</p>
 
 <pre>
-package com.example.hello;
+package com.example.helloandroid;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -157,7 +157,7 @@ have a user interface, but usually will.</p>
 The bold items are lines that have been added.</p>
 
 <pre>
-package com.android.hello;
+package com.android.helloandroid;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -377,7 +377,7 @@ The entire file should now look like this:
 <li>Now open and modify your <code>HelloAndroid</code> class use the
 XML layout. Edit the file to look like this:
 <pre>
-package com.example.hello;
+package com.example.helloandroid;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -469,7 +469,7 @@ debugger. To demonstrate this, introduce a bug into
 your code. Change your HelloAndroid source code to look like this:</p>
 
 <pre>
-package com.android.hello;
+package com.android.helloandroid;
 
 import android.app.Activity;
 import android.os.Bundle;
diff --git a/docs/html/guide/tutorials/views/hello-mapview.jd b/docs/html/guide/tutorials/views/hello-mapview.jd
index 976b8ab42e50..30b92c46eee9 100644
--- a/docs/html/guide/tutorials/views/hello-mapview.jd
+++ b/docs/html/guide/tutorials/views/hello-mapview.jd
@@ -3,6 +3,32 @@ parent.title=Hello, Views
 parent.link=index.html
 @jd:body
 
+<div class="special">
+<p>This tutorial requires that you have the Google Maps external library
+installed in your SDK environment. By default the Android 1.5 SDK includes the
+Google APIs add-on, which in turn includes the Maps external library. If you
+don't have the Google APIs SDK add-on, you can download it from this
+location:</p>
+
+<p style="margin-left:2em;"><a
+href="http://code.google.com/android/add-ons/google-apis">http://code.google.com/android/add-ons/google-apis</a></p>
+
+<p>The Google APIs add-on requires Android 1.5 SDK or later release. After
+installing the add-on in your SDK, set your project properties to use the build
+target called "Google APIs Add-on". See the instructions for setting a build
+target in <a href="{@docRoot}guide/developing/eclipse-adt.html">Developing in
+Eclipse with ADT</a> or <a
+href="{@docRoot}guide/developing/other-ide.html">Developing in Other IDEs</a>,
+as appropriate for your environment. </p>
+
+<p>You will also need to use the android tool to set up an AVD that uses the
+Google APIs deployment target. See <a
+href="{@docRoot}guide/developing/tools/avd.html">Android Virtual Devices</a> for
+more information. Once you have set up your environment, you will be able to
+build and run the project described in this tutorial</a></p>
+
+</div>
+
 <p>A MapView allows you to create your own map-viewing Activity. 
 First, we'll create a simple Activity that can view and navigate a map. Then we will add some overlay items.</p>
 
diff --git a/docs/html/index.jd b/docs/html/index.jd
index bd681e2c6d97..cc609a3d681b 100644
--- a/docs/html/index.jd
+++ b/docs/html/index.jd
@@ -12,7 +12,7 @@ home=true
                         <!-- total max width is 520px -->
                             <img src="{@docRoot}assets/images/home/IO-logo.png" alt="Google I/O Developer Conference 2009" width="242px" />
                             <div id="announcement" style="width:270px">
-                              <p>Google I/O is a two-day developer event that will take place May 27-28 at Moscone Center, San Francisco.</p>
+                              <p>Google I/O is a two-day developer event that will take place May 27-28 at Moscone Center, San Francisco. The agenda includes a number of great sessions on Android topics by team engineers and other developers.</p>
                               <p><a href="http://code.google.com/events/io/">Learn more &raquo;</a></p>
                             </div> <!-- end annoucement -->
                         </div> <!-- end annoucement-block -->
@@ -116,10 +116,10 @@ home=true
     'sdk': {
       'layout':"imgLeft",
       'icon':"sdk-small.png",
-      'name':"SDK 1.1 r1",
+      'name':"SDK 1.5 r1",
       'img':"sdk-large.png",
-      'title':"Android 1.1 SDK r1",
-      'desc': "<p>A new Android SDK is available for download. The new SDK includes minor API changes, new UI localizations, bug fixes and some new application features.</p><p><a href='{@docRoot}sdk/1.1_r1/index.html'>Download Android 1.1 SDK r1</a></p>"
+      'title':"Android 1.5 SDK r1",
+      'desc': "<p>The final version of the Android 1.5 SDK is now available. It includes new APIs for Android 1.5, updated developer tools, multiple platform versions, and a Google APIs Add-on.</p><p><a href='{@docRoot}sdk/1.5_r1/index.html'>Download Android 1.5 SDK</a></p>"
     },
 
     'mapskey': {
@@ -128,7 +128,7 @@ home=true
       'name':"Maps API Key",
       'img':"maps-large.png",
       'title':"Maps API Key",
-      'desc':"<p>If you're writing an Android application that uses Google Maps (with MapView), you must register your application to obtain a Maps API Key. Without the key, your maps application will not work on Android devices. Obtaining a key requires just a couple of steps.</p><p><a href='{@docRoot}guide/topics/location/geo/mapkey.html'>Learn how to get a Maps API Key</a></p>"
+      'desc':"<p>If you're writing an Android application that uses Google Maps (with MapView), you must register your application to obtain a Maps API Key. Without the key, your maps application will not work on Android devices. Obtaining a key requires just a couple of steps.</p><p><a href='{@docRoot}guide/topics/location/index.html'>Learn more...</a></p>"
     },
 
     'market': {
diff --git a/docs/html/maps-api-signup.html b/docs/html/maps-api-signup.html
deleted file mode 100644
index a604b2ad0eb5..000000000000
--- a/docs/html/maps-api-signup.html
+++ /dev/null
@@ -1,369 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-  <head>
-    
-<meta http-equiv="content-type" content="text/html; charset=utf-8"/>
-<title>Sign Up for the Android Maps API - Android Maps API - Google Code</title>
-<link href="http://code.google.com/css/codesite.pack.01312008.css" type="text/css" rel="stylesheet"></link>
-<script src="http://code.google.com//js/codesite.pack.01312008.js" type="text/javascript"></script>
-<link rel="search" type="application/opensearchdescription+xml" title="Google Code" href="/osd.xml" />
-
-<!--[if IE]><link rel="stylesheet" type="text/css" href="/css/iehacks.css" /><![endif]-->
-
-
-<script type="text/javascript">
-//<![CDATA[
-
-function CheckForm(form) {
-  if (!form["agreeTerms"].checked) {
-    alert("To get an Android Maps API key, " + 
-        "you must agree to the API terms by checking the checkbox.");
-  } else {
-    var fp = form["fp"].value;
-    if (fp.length < 32) {
-      alert("Please enter the MD5 fingerprint of the certificate you will use to sign your Android Application.");
-      form["fp"].focus();
-    } else {
-      top.location = "http://www.google.com/glm/mmap/a/api?fp=" +
-                     encodeURIComponent(fp);
-    }
-  }
-  return false;
-}
-
-//]]>
-</script>
-  </head>
-
-  <body class="gc-documentation">
-    <div id="gc-container">
-<a name="top"></a>
-<div id="skipto">
-  
-  
-</div>
-<div id="gc-header">
-  <div id="logo"><a href="/">
-  
-     <img src="/images/cleardot.gif" height="1px" width="1px" alt="Google Code Home Page" id="gc-logo-img"/>
-  
-  </a></div>
-  <div id="search">
-    <div id="searchForm" class="searchForm" style="display:none">
-      <form action="" accept-charset="utf-8" class="gsc-search-box" onsubmit="executeGSearch(document.getElementById('gsearchInput').value); return false;">
-        <table class="gsc-search-box" cellpadding="0" cellspacing="0">
-          <tbody>
-            <tr>
-              <td class="gsc-input">
-                <input id="gsearchInput" type="text" name="q" maxlength="2048" class="gsc-input" autocomplete="off" title="Google Code Search" style="width:345px"/>
-              </td>
-              <td class="gsc-search-button">
-                <div id='cs-searchresults' onclick='event.cancelBubble = true;'></div>
-                <input title="Search" id="gsearchButton" class="gsc-search-button" value="Search" type="submit"/>
-              </td>
-            </tr>
-            <tr>
-              <td class="greytext">e.g. "ajax apis" or "open source"</td>
-            </tr>
-          </tbody>
-        </table>
-      </form>
-    </div> <!-- end searchForm -->
-    <div id="searchForm2" class="searchForm2" style="display:block">
-      <form id="cse" action="http://www.google.com/cse">
-        <input type="hidden" name="cref" value="http://code.google.com/cse/googlecode-context.xml" />
-        <input type="text" name="q" maxlength="2048" autocomplete="off" title="Google Code Search" style="width:345px"/>
-        <input type="submit" name="sa" value="Search" title="Search"/><br/>
-        <div class="greytext">e.g. "ajax apis" or "open source"</div>
-      </form>
-    </div> <!-- end searchForm2 -->
-  </div> <!-- end search -->
-</div> <!-- end gc-header -->
-
-
-<div id="codesiteContent">
-
-<a name="gc-topnav-anchor"></a>
-<div id="gc-topnav">
-  <h1>Android Maps API Key Signup</h1>
-  <ul id="docs" class="gc-topnav-tabs">
-    <li id="home_link">
-      <a href="/android/" title="Android Developer Site">Home</a>
-    </li>
-  
-    <li id="docs_link">
-      <a href="/android/toolbox/apis/lbs.html" title="Android Maps API Documentation">Docs</a>
-    </li>
-  
-    <li>
-      <a href="http://googlegeodevelopers.blogspot.com/" title="Official Google Maps API blog">Maps Blog</a>
-    </li>
-  
-    <li>
-      <a href="http://android-developers.blogspot.com/" title="Official Android Developers Blog">Android Blog</a>
-    </li>
-  </ul>
-</div> <!-- end gc-topnav -->
-
-
-<div>
-<!--
-    <div class="g-section g-tpl-170">
-
-      <a name="gc-toc-anchor"></a>  
-      <div class="g-unit g-first" id="gc-toc">
-        <ul>
-          <li>Add some sidebar content?</li>
-        </ul>
-        <div class="line"></div>
-      </div>
--->
-      
-      <a name="gc-pagecontent-anchor"></a>   
-      <div class="g-unit" id="gc-pagecontent">
-        <h1 class="page_title">Sign Up for the Android Maps API</h1>
-
-<p>The Android Maps API lets you embed
-<a href="/android/reference/com/google/android/maps/MapView.html">Google
-Maps</a> in your own Android applications.  A single Maps API key is
-valid for all applications signed by a single certificate.  See
-this <a href="/android/intro/develop-and-debug.html#signing">documentation
-page</a> for more information about application signing.  To get a
-Maps API key for your certificate, you will need to provide its the certificate's
-fingerprint.  This can be obtained using Keytool.  For example, on
-Linux or Mac OSX, you would examine your debug keystore like this:
-<pre class="prettyprint">$ keytool -list -keystore ~/.android/debug.keystore
-...
-Certificate fingerprint (MD5): 94:1E:43:49:87:73:BB:E6:A6:88:D7:20:F1:8E:B5:98
-</pre>
-
-<p>If you use different keys for signing development builds and
-release builds, you will need to obtain a separate Maps API key for
-each certificate.  Each key will only work in applications signed by
-the corresponding certificate.</p>
-
-<p>You also need a <a href="http://www.google.com/accounts/">Google Account</a> 
-to get a Maps API key, and your API key will be connected to your Google Account.</p>
-<br/>
-<div id="termsbox" style="margin-left: 2em">
-<textarea rows="15" cols="70" readonly="readonly" onfocus="this.blur()">
-Android Maps APIs Terms of Service 
-
-Last Updated: October 13, 2008
-
-Thanks for your interest in the Android Maps APIs.  The Android Maps APIs are a collection of services (including, but not limited to, the "com.google.android.maps.MapView" and "android.location.Geocoder" classes) that allow you to include maps, geocoding, and other content from Google and its content providers in your Android applications.  The Android Maps APIs explicitly do not include any driving directions data or local search data that may be owned or licensed by Google.   
-
-
-1.  Your relationship with Google.   
-    1.1. Your use of any of the Android Maps APIs (referred to in this document as the "Maps API(s)" or the "Service") is subject to the terms of a legal agreement between you and Google Inc., whose principal place of business is at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States ("Google").  This legal agreement is referred to as the "Terms."
-    1.2. Unless otherwise agreed in writing with Google, the Terms will include the following:  1) the terms and conditions set forth in this document (the "Maps APIs Terms"); 2) the Legal Notices (http://www.google.com/intl/en-us/help/legalnotices_maps.html); and 3) the Privacy Policy (http://www.google.com/privacy.html).  Before you use the Maps APIs, you should read each of the documents comprising the Terms, and print or save a local copy for your records.  
-    1.3. If you use the Maps APIs in conjunction with any other Google products or services, including any other Google API, (collectively, the "Services"), your agreement with Google will also include the terms applicable to those Services. All of these are referred to as the "Additional Terms."  If Additional Terms apply, they will be accessible to you either within or through your use of that Service.  If there is any contradiction between what any Additional Terms say and what the Maps APIs Terms say, then the Maps APIs Terms will take precedence only as it relates to the Maps APIs, and not to any other Services.
-    1.4. Google reserves the right to make changes to the Terms from time to time. When these changes are made, Google will make a new copy of the Terms available at http://code.google.com/android/maps-api-tos.pdf.  You understand and agree that if you use the Service after the date on which the Terms have changed, Google will treat your use as acceptance of the updated Terms.  If a modification is unacceptable to you, you may terminate the agreement by ceasing use of the Maps APIs as well distribution of any applications that use the Maps APIs.
-    1.5. Definitions
-        (a) "Content" means any content provided through the Service, including map and terrain data, photographic imagery, traffic data, or any other content.
-        (b) "Maps API Implementation" means a software application that uses the Maps APIs to obtain and display Content in conjunction with Your Content, according to these Terms.
-        (c)  "Your Content" means any content that you provide in your Maps API Implementation, including data, images, video, or software.  Your Content does not include the Content.
-
-
-2. Accepting the Terms
-    2.1. In order to use the Maps APIs you must agree to the Terms.  You can accept the Terms by: (a) clicking to accept or agree to the Terms, where this option is made available to you by Google in the user interface for the Service; or (b) using the Maps APIs.  In this case, you understand and agree that Google will treat your use of the Maps APIs as acceptance of the Terms from that point onwards.
-    2.2. You may not use the Maps APIs and may not accept the Terms if you are a person barred from using the Service under the laws of the United States or the country in which you are resident or from which you use the Service. 
-    2.3. You represent that you have full power, capacity and authority to accept these Terms.  If you are accepting on behalf of your employer or another entity, you represent that you have full legal authority to bind your employer or such entity to these Terms.  If you don't have the legal authority to bind, please ensure that an authorized person from your entity consents to and accepts these Terms.
-
-
-3. Privacy and Personal Information
-    3.1. For information about Google's data protection practices, please read Google's Privacy Policy at http://www.google.com/privacy.html.  This policy explains how Google treats your personal information and protects your privacy when you use the Service.
-    3.2. You agree to the use of your data in accordance with Google's Privacy Policy.
-
-
-4. Provision of Service by Google
-    4.1. Google has subsidiaries and affiliated legal entities around the world ("Subsidiaries and Affiliates").  Sometimes, these companies will be providing the Service to you on behalf of Google itself.  You acknowledge and agree that Subsidiaries and Affiliates will be entitled to provide the Service to you.
-    4.2. Google is constantly innovating in order to provide the best possible experience for its users.  You acknowledge and agree that the form and nature of the Service that Google provides may change from time to time without prior notice to you.  As part of this continuing innovation, you acknowledge and agree that Google may stop (temporarily or permanently) providing the Service (or any features within the Service) to you or to users generally at Google's sole discretion, without prior notice to you.  Google reserves the right to refuse or discontinue the Service to anyone, and to disable users' access to the Service, including the Maps APIs or any Content, at any time in its sole discretion with or without notice.
-    4.3. You acknowledge and agree that Google may impose or adjust the limit on the number of transactions you may send or receive through the Service; such fixed upper limits may be set by Google at any time, at Google's discretion.  
-    4.4. Google reserves the right to release subsequent versions of the Maps APIs and to require you to obtain and use the most recent version.
-    4.5. The Service currently does not include advertising in the Content.  However, Google reserves the right to include advertising in the Content provided to you through the Service, but will provide you with sixty (60) days notice prior to the commencement of advertising.  Such notice may be provided on relevant Google websites, including but not limited to theÿGoogle Maps API Blog (http://googlemapsapi.blogspot.com) and theÿGoogle Maps API Groupÿ(http://groups.google.com/group/Google-Maps-API) or such successor URLs that Google may designate from time to time.  During that 60 day period, you may terminate your use of the Service, or provide notice of your refusal to accept advertising in accordance with Google's policies and procedures for providing such notice (which Google may make available from time to time in its sole discretion).
-
-
-5. Use of the Service by You
-    5.1. In order to access the Service, you must have a Google Account.  You agree that any information you give to Google in connection with your Google Account or your continued use of the Service will always be accurate, correct and up to date.
-    5.2. After supplying Google with your account information and the MD5 fingerprint for the certificate used to sign your application, and accepting the Terms, you will be issued an alphanumeric key assigned to you by Google that is uniquely associated with your Google Account and the application certificate.  Your Maps API implementation?s MapView must include this alphanumeric key, either using the "android:apiKey" XML attribute or using the appropriate MapView constructor, as described in the Android MapView documentation (http://code.google.com/android/reference/com/google/android/maps/MapView.html).  
-    5.3. There is currently no limit to the number of keys you may obtain in this manner provided that you use a different certificate for each key you obtain and that you use the same Google Account for every key you obtain.  You agree that each key is only valid for applications signed with the corresponding certificate.  You agree that Google may, in its sole discretion, impose a limit on the number of keys that may be obtained in the future.  You agree that your continued use of any of the keys assigned by Google or distribution of any applications using such keys constitutes your continued agreement to these Terms.
-    5.4. Subject to these Terms, you may develop, display and/or distribute your Maps API Implementation as part of a commercial or non-commercial enterprise. 
-    5.5. Your Maps API Implementation and Your Content must not violate Google's Software Principles available at http://www.google.com/intl/en/corporate/software_principles.html (or such successor URL as Google may provide) and any other policies as Google may develop from time to time and make available to you.
-    5.6. You agree to use the Service only for purposes that are permitted by: (1) the Terms; (2) any applicable third-party contract, law, or regulation; and (3) any applicable policies or guidelines made available by Google.  By way of example, and not as a limitation, you agree that when using the Service, you will not
-        a. defame, abuse, harass, stalk, threaten or otherwise violate the legal rights (such as rights of privacy and publicity) of others;
-        b. upload, post, transmit or otherwise make available any inappropriate, defamatory, obscene, or unlawful content;
-        c. upload, post, transmit or otherwise make available any content that infringes any patent, trademark, copyright, trade secret or other proprietary right of any party, unless you are the owner of the rights, or have the permission of the owner or other legal justification to use such content;
-        d. upload, post, transmit or otherwise make available messages that promote pyramid schemes, chain letters, or disruptive commercial messages or advertisements;
-        e. download any file posted by another that you know, or reasonably should know, cannot legally be distributed in such manner;
-        f. impersonate another person or entity, or falsify or delete any author attributions or labels of the origin or source of Content, or other material;
-        g. restrict or inhibit any other users from using and enjoying the Service;
-        h. remove, obscure, or fail to display the Terms of Use link as presented through the Service or described in the Service documentation;
-        i. remove, alter, or obscure any copyright, trademark or other proprietary rights notices or labels of origin or proprietary rights designation contained in or on Google Services or Content;
-        j. delete, obscure, or in any manner alter any warning, notice (not limited to any copyright or other proprietary rights notice), or link which appears in the Service or the Content
-        k. interfere with or disrupt Google Services or servers or networks connected to Google Services, or disobey any requirements, procedures, policies or regulations of networks connected to Google Services;
-        l. use any robot, spider, site search/retrieval application, or other device to retrieve or index any portion of the Service or Content or collect information about users for any unauthorized purpose;
-        m. display content in your Maps API Implementation that falsely expresses or implies that such content is sponsored or endorsed by Google;
-        n. create user accounts by automated means or under false or fraudulent pretenses, or obtain or attempt to obtain keys for the Service using multiple Google Accounts;
-        o. promote or provide instructional information about illegal activities;
-        p. promote physical harm or injury against any group or individual; or
-        q. transmit any viruses, worms, defects, Trojan horses, or any items of a destructive nature.
-    5.7. You agree that if you use the Service to develop a Maps API Implementation for use by other users, you will protect the privacy and legal rights of those users. If your Maps API Implementation provides you or another party with information about users, including but not limited to personally identifiable information or non-personally identifiable usage information, you must make the users aware that the information will be available to you or another party, and you must provide legally adequate privacy notice and protection for those users. If your application stores information submitted by users, it must do so securely. If your Maps API Implementation allows a user to provide you with Google Account information, you may only use that information to access the user's Google Account when, and for the limited purposes for which, the user has given you permission to do so.
-    5.8. You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under the Terms or any applicable law or regulation, and for the consequences (including any loss or damage which Google may suffer) of any such breach.
-
-
-6. Google?s Proprietary Rights
-    6.1. Ownership.  You acknowledge and agree that Google (or Google's licensors and their suppliers, as applicable) own all legal right, title and interest in and to the Service and Content, including any intellectual property rights that subsist in the Service and Content (whether those rights happen to be registered or not, and wherever in the world those rights may exist).
-    6.2. Brand Feature License.  For purposes of these Terms, "Brand Features" will mean the trade names, trademarks, service marks, logos, domain names, and other distinctive brand features of each party, respectively, as secured by such party from time to time.  Google grants to you a nontransferable, nonsublicenseable, nonexclusive license during the Term to display Google's Brand Features for the purpose of promoting or advertising that you use the Service in accordance with this Section 6.2 and for the purpose of fulfilling your obligations under Section 6.5 below.  You grant to Google a nontransferable, nonexclusive license during the Term to use Your Brand Features to advertise that you are using the Service.  In using Google Brand Features, you will not:
-        a. display a Google Brand Feature in any manner that implies a relationship or affiliation with, sponsorship, or endorsement by Google, other than your use of the Service, or that can be reasonably interpreted to suggest editorial content has been authored by, or represents the views or opinions of Google or Google personnel;
-        b. use Google Brand Features to disparage Google, its products or Services;
-        c. display a Google Brand Feature on your site if it contains or displays adult content or promotes illegal activities, gambling, or the sale of tobacco or alcohol to persons under twenty-one (21) years of age;
-        d. have the Google logo as the largest logo in your application (except as displayed in the map image itself);
-        e. display a Google Brand Feature as the most prominent element in any part of your application;
-        f. display a Google Brand Feature in a manner that is misleading, defamatory, infringing, libelous, disparaging, obscene or otherwise objectionable to Google;
-        g. display a Google Brand Feature on a site that violates any law or regulation; or
-        h. remove, distort or alter any element of a Google Brand Feature (this includes squeezing, stretching, inverting, discoloring, etc.).
-    6.3. You understand and agree that Google has the sole discretion to determine whether your use of Google brand features is in accordance with the above restrictions.
-    6.4. Except as set forth in this Section 6, nothing in the Terms will grant or will be deemed to grant to one party any right, title or interest in or to the other party's Brand Features.  All use by you of Google's Brand Features (including any goodwill associated therewith) will inure to the benefit of Google.  At no time during or after the Term will you challenge or assist others to challenge the Brand Features of Google (except to the extent such restriction is prohibited by law) or the registration thereof by Google, nor will you attempt to register any Brand Features (including domain names) that are confusingly similar in any way (including but not limited to, sound, appearance and spelling) to those of Google.
-    6.5.  You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices, Terms of Use links, or Brand Features) that may be affixed to or provided through the Service.  Where such notices are not affixed within the Service, you agree to display such notices according to the Service documentation if so specified.
-
-
-7. License from Google
-    7.1. Service.  Google gives you a personal, worldwide, royalty-free, non-assignable and non-exclusive license to use the Service as provided by Google, in the manner permitted by the Terms.  
-    7.2. Content.  Google gives you a personal, worldwide, royalty-free, non-assignable and non-exclusive license to access, use, publicly perform and publicly display the Content in your Maps API Implementation, as the Content is provided in the Service, and in the manner permitted by the Terms.  Specifically, you understand the following:
-        a.  Content, not limited to map data, traffic, and directions, is provided for planning purposes only.  You may find that weather conditions, construction projects, closures, or other events may cause road conditions or directions to differ from the results depicted in the Content.  You should exercise judgment in your use of the Content.
-        b.  Certain Content is provided under license from third parties (http://www.google.com/intl/en_us/help/legalnotices_maps.html), including Tele Atlas B.V. ("Tele Atlas"), and is subject to copyright and other intellectual property rights owned by or licensed to Tele Atlas and/or such third parties. You may be held liable for any unauthorized copying or disclosure of this content.  Your use of Tele Atlas map data is subject to additional restrictions located in the Legal Notices (http://www.google.com/intl/en_us/help/legalnotices_maps.html) page.
-    7.3. In addition to the license granted here, you may use certain Content according to the terms set forth in our Permission Guidelines for Google Maps and Google Earth (http://www.google.com/permissions/geoguidelines.html).
-    7.4. U.S. Government Restricted Rights.  If the Service is being used or accessed by or on behalf of the United States government, such use is subject to additional terms located in the "Government End Users" section of our Legal Notices (http://www.google.com/intl/en_us/help/legalnotices_maps.html) page.  
-    7.5. Google reserves the sole right and discretion to determine whether your use of the Service and Content is in conformance with these Terms.
-
-
-8. License Restrictions.  Except as expressly permitted under the Terms, or unless you have received prior written authorization from Google (or, as applicable, from the provider of particular Content), the license granted to you in Section 7 is conditioned on your adherence to all of the restrictions in this Section 8.  Under this Section 8, you must not (nor may you permit anyone else to):
-    8.1.  access or use the Service or any Content through any technology or means other than those provided in the Service, or through other explicitly authorized means Google may designate;
-    8.2.  copy, translate, modify, create a derivative work of, pre-fetch, cache, or publicly display any Content or any part thereof.
-    8.3.  redistribute, sublicense, rent, publish, sell, assign, lease, market, transfer, or otherwise make the Service or Content available to third parties;
-    8.4.  reverse engineer, decompile or otherwise attempt to extract the source code of the Service or any part thereof, unless this is expressly permitted or required by applicable law;
-    8.5.  use the Service in a manner that gives your or any other person access to mass downloads or bulk feeds of any Content, including but not limited to numerical latitude or longitude coordinates;
-    8.6.  delete, obscure, or in any manner alter any warning, notice (including but not limited to any copyright or other proprietary rights notice), or link that appears in the Service or the Content;
-    8.7.  use the Service or Content with any products, systems, or applications for or in connection with (a) real time navigation or route guidance based on position input from a sensor (including but not limited to any visual or audible turn-by-turn route guidance); or (b) any systems or functions for automatic or autonomous control of vehicle behavior; or (c) dispatch, fleet management, business asset tracking, or similar enterprise applications (for avoidance of doubt, you are permitted to use the Service to create Maps API Implementations to track people or assets equipped with a sensor, where the tracking of the people or assets is not critical to the core business or service of the application user.  For example, you are permitted to use the Maps APIs to create "Friend Finder" applications that allow consumers to track the locations of their friends? mobile devices, but you are not permitted to use the Maps APIs to create "Business Asset Tracking" applications that track or locate business or government users? field sales or field service personnel, vehicles or other assets that are critical (not incidental) to the core business or service of the application user);
-    8.8 print more than 5,000 copies of sales collateral materials containing a screenshot with Tele Atlas Content for commercial sales lead generation ("Direct Marketing"); (if you desire (a) to use Tele Atlas Content for Direct Marketing in excess of the above amount, or (b) to incorporate Tele Atlas Content as a core part of printed matter (such as printed maps or guide books) that you redistribute for a fee, you must contact Tele Atlas to obtain a license to do so); or
-    8.9 offer a professional batch geocoding service that uses the Content contained in any Google Services.
-
-
-9. Content License from You
-    9.1. You retain copyright and any other rights you already hold in Your Content.  If you decide to submit or post Your Content to Google, you give Google a perpetual, irrevocable, worldwide, royalty-free, and non-exclusive license to reproduce, adapt, modify, translate, publish, publicly perform, publicly display and distribute Your Content.  This license is solely for the purpose of enabling Google to display, distribute and promote the Service.
-    9.2. You agree that this license includes a right for Google to make such Content available to other companies, organizations or individuals with whom Google has relationships for the provision of syndicated services, and to use such Content in connection with the provision of those services.
-    9.3. You understand that Google, in performing the required technical steps to provide the Service to our users, may (a) transmit or distribute your Content over various public networks and in various media; and (b) make such changes to your Content as are necessary to conform and adapt that Content to the technical requirements of connecting networks, devices, services or media.  You agree that this license will permit Google to take these actions.
-    9.4. You confirm and warrant to Google that you have all the rights, power and authority necessary to grant the above license.
-
-
-10. Your Passwords and Account Security
-    10.1. You agree and understand that you are responsible for maintaining the confidentiality of passwords or developer keys associated with any account you use to access the Service.  Accordingly, you agree that you will be solely responsible to Google for your use of the Service including, but not limited to, activities that occur under your account or developer key.  If you become aware of any unauthorized use of your password or of your account, you agree to notify Google immediately.
-
-
-11. Terminating this Agreement
-    11.1. The Terms will continue to apply until terminated by either you or Google as set out below.
-    11.2. You may terminate your legal agreement with Google by discontinuing your use of the Service at any time, removing the Maps API code from your Maps API Implementation, and ceasing the distribution of any Maps API Implementation that uses the Maps API.  You do not need to specifically inform Google when you stop using the Service.
-    11.3. Google may, at any time, terminate its legal agreement with you at its discretion without prior notice to you.
-    11.4. Nothing in this Section will affect Google's rights regarding provision of the Service under Section 4 of the Terms.
-    11.5. When this legal agreement comes to an end, those Terms that by their nature are intended to continue indefinitely will continue to apply, including but not limited to Sections 6.1, 6.3 and 6.4 (Google?s Proprietary Rights);  11.4 and 11.5 (Terminating this Agreement); 12 (Exclusion of Warranties); 13 (Limitation of Liability); 14 (Indemnity); and 18 (General Legal Terms).
-
-
-12. EXCLUSION OF WARRANTIES
-    12.1. NOTHING IN THESE TERMS, INCLUDING SECTIONS 12 AND 13, WILL EXCLUDE OR LIMIT GOOGLE'S WARRANTY OR LIABILITY FOR LOSSES WHICH MAY NOT BE LAWFULLY EXCLUDED OR LIMITED BY APPLICABLE LAW.  SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF CERTAIN WARRANTIES OR CONDITIONS OR THE LIMITATION OR EXCLUSION OF LIABILITY FOR CERTAIN TYPES OF LOSS OR DAMAGES. ACCORDINGLY, ONLY THE LIMITATIONS THAT ARE LAWFUL IN YOUR JURISDICTION WILL APPLY TO YOU, AND GOOGLE?S LIABILITY WILL BE LIMITED TO THE MAXIMUM EXTENT PERMITTED BY LAW.
-    12.2. YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE SERVICE AND THE CONTENT IS AT YOUR SOLE RISK AND THAT THE SERVICE AND THE CONTENT ARE PROVIDED "AS IS" AND "AS AVAILABLE."  IN PARTICULAR, GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS AND THEIR SUPPLIERS, DO NOT REPRESENT OR WARRANT TO YOU THAT:
-        a.  YOUR USE OF THE SERVICE WILL MEET YOUR REQUIREMENTS;
-        b.  YOUR USE OF THE SERVICE WILL BE UNINTERRUPTED, TIMELY, SECURE OR FREE FROM ERROR;
-        c.  ANY INFORMATION OBTAINED BY YOU AS A RESULT OF YOUR USE OF THE SERVICES WILL BE ACCURATE OR RELIABLE; AND
-        d.  THAT DEFECTS IN THE OPERATION OR FUNCTIONALITY OF ANY SOFTWARE PROVIDED TO YOU AS PART OF THE SERVICES WILL BE CORRECTED.
-    12.3. ANY CONTENT OBTAINED THROUGH THE USE OF THE SERVICES IS DONE AT YOUR OWN DISCRETION AND RISK AND YOU WILL BE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE, LOSS OF DATA, OR ANY OTHER DAMAGE OR INJURY THAT RESULTS FROM THE DOWNLOAD OR USE OF ANY SUCH CONTENT.
-    12.4. NO ADVICE OR INFORMATION, WHETHER ORAL OR WRITTEN, OBTAINED BY YOU FROM GOOGLE, OR THROUGH OR FROM THE SERVICE OR CONTENT, WILL CREATE ANY WARRANTY NOT EXPRESSLY STATED IN THE TERMS.
-    12.5. GOOGLE, ITS LICENSORS AND THEIR SUPPLIERS FURTHER EXPRESSLY DISCLAIM ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-
-
-13. LIMITATION OF LIABILITY
-    13.1. EXCEPT AS EXPRESSLY PROVIDED IN THE INDEMNITY PROVISION (SECTION 14) AND SUBJECT TO SECTION 12.1, YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND GOOGLE?S LICENSORS AND THEIR SUPPLIERS, WILL NOT BE LIABLE TO YOU FOR:
-        a.  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, HOWEVER CAUSED AND UNDER ANY THEORY OF LIABILITY (INCLUDING, BUT NOT BE LIMITED TO, ANY LOSS OF PROFIT (WHETHER INCURRED DIRECTLY OR INDIRECTLY), ANY LOSS OF GOODWILL OR BUSINESS REPUTATION, ANY LOSS OF DATA, COST OF PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, OR OTHER INTANGIBLE LOSS);
-        b.  ANY LOSS OR DAMAGE AS A RESULT OF:
-            i.  ANY RELIANCE PLACED BY YOU ON THE COMPLETENESS, ACCURACY OR EXISTENCE OF ANY ADVERTISING, OR AS A RESULT OF ANY RELATIONSHIP OR TRANSACTION BETWEEN YOU AND ANY ADVERTISER OR SPONSOR WHOSE ADVERTISING APPEARS ON THE SERVICES;
-            ii. ANY CHANGES THAT GOOGLE MAY MAKE TO THE SERVICES, OR ANY PERMANENT OR TEMPORARY CESSATION IN THE PROVISION OF THE SERVICES (OR ANY FEATURES WITHIN THE SERVICES);
-            iii.  THE DELETION OF, CORRUPTION OF, OR FAILURE TO STORE, ANY CONTENT AND OTHER COMMUNICATIONS DATA MAINTAINED OR TRANSMITTED BY OR THROUGH YOUR USE OF THE SERVICES;
-            iv. YOUR FAILURE TO PROVIDE GOOGLE WITH ACCURATE ACCOUNT INFORMATION; OR
-            v.  YOUR FAILURE TO KEEP YOUR PASSWORD OR ACCOUNT DETAILS SECURE AND CONFIDENTIAL.
-    13.2. THE LIMITATIONS ON GOOGLE'S LIABILITY TO YOU IN SECTION 13.1 ABOVE WILL APPLY WHETHER OR NOT GOOGLE, ITS AFFILIATES, LICENSORS OR THEIR SUPPLIERS HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES OR DAMAGES.
-
-
-14. Indemnity
-    14.1. You hereby agree to indemnify, defend and hold Google, its strategic partners, officers, directors, agents, affiliates, licensors and their suppliers ("the Indemnified Parties") harmless from and against any claim or liability arising out of: (a) your use of the Maps APIs in breach of the Terms or applicable policies; (b) your Maps API Implementation; (c) any use by users of your Maps API Implementation; (d) any breach of or noncompliance with any representation, warranty or obligation in these Terms or applicable policies; and (e) any claim that your Maps API Implementation or Your Content violates any applicable law, including but not limited to any claim that your Maps API Implementation infringes the rights of a third party.  You will cooperate as fully as reasonably required in the defense of any claim.  Google reserves the right, at its own expense, to assume the exclusive defense and control of any matter subject to indemnification by you.  You acknowledge that damages for improper use of the Maps APIs may be irreparable; therefore, Google is entitled to seek equitable relief, including but not limited to preliminary injunction and injunction, in addition to all other remedies. 
-
-
-15. Copyright Policies
-    15.1. It is Google's policy to respond to notices of alleged copyright infringement that comply with applicable international intellectual property law (including, in the United States, the Digital Millennium Copyright Act) and to terminate the accounts of repeat infringers.  Details of Google's policy can be found at http://www.google.com/igoogle_dmca.html.
-
-
-16. Other Content
-    16.1. The Service may include hyperlinks to other web sites or content or resources.  Google has no control over any web sites or resources that are provided by companies or persons other than Google.  You acknowledge and agree that Google is not responsible for the availability of any such external sites or resources, and does not endorse any advertising, products or other materials on or available from such web sites or resources.
-    16.2. You acknowledge and agree that Google is not liable for any loss or damage that may be incurred by you as a result of the availability of those external sites or resources, or as a result of any reliance placed by you on the completeness, accuracy or existence of any advertising, products, or other materials on, or available from, such web sites or resources.
-
-
-17. Language of the Terms
-    17.1. Where Google has provided you with a translation of the English language version of the Terms, you agree that the translation is provided for your convenience only and that the English language version of the Terms will govern your relationship with Google.
-    17.2. If there is any contradiction between the English language version of the Terms and a translation of the Terms, the English language version will take precedence.
-
-
-18. General Legal Terms
-    18.1. The Terms constitute the whole legal agreement between you and Google and govern your use of the Service and Content, and completely replace and supersede any prior agreements between you and Google, written or oral, in relation to the Service and Content.  The Terms may be assigned by Google and will inure to the benefit of Google, its successors and assigns.
-    18.2. You agree that Google may provide you with notices, including those regarding changes to the Terms, by email, regular mail, or postings on the Service.
-    18.3. You agree that if Google does not exercise or enforce any legal right or remedy contained in the Terms (or that Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google.  Any waiver of any provision of these Terms will be effective only if Google expressly states in a signed writing that it is waiving a specified Term.
-    18.4. If any court of law that has jurisdiction rules that any provision of these Terms is invalid, then that provision will be removed from the Terms without affecting the rest of the Terms.  The remaining provisions of the Terms will continue to be valid and enforceable.
-    18.5. You acknowledge and agree that each member of the group of companies of which Google is the parent will be third party beneficiaries to the Terms and that such other companies will be entitled to directly enforce, and rely upon, any provision of the Terms that confers a benefit on (or rights in favor of) them.  Other than this, no other person or company will be a third party beneficiary to the Terms.
-    18.6. The Terms, and your relationship with Google under the Terms, will be governed by the laws of the State of California, USA, without regard to its conflict of laws provisions.  You and Google agree to submit to the exclusive jurisdiction of the courts located in the County of Santa Clara, California, USA, to resolve any legal matter arising from the Terms.  Notwithstanding this, you agree that Google will be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.
-</textarea>
-</div>
-
-<form action="signup.html" method="get" onsubmit="return CheckForm(this)">
-  <div class="terms">
-    <table style="width:95%">
-      <tr>
-        <td style="width:1em"><input type="checkbox" name="agreeTerms" value="1"/></td>
-        <td>I have read and agree with the terms and conditions <span class="printable">(<a href="maps-api-tos.pdf">printable version</a>)</span></td>
-      </tr>
-      <tr>
-        <td></td>
-        <td>
-          My certificate's MD5 fingerprint:
-          <input type="text" name="fp" size="47" value=""/>
-        </td>
-      </tr>
-      <tr>
-        <td></td>
-        <td><input type="submit" value="Generate API Key"/></td>
-      </tr>
-    </table>
-  </div>
-</form>
-
-        <!-- end body text -->
-
-   
-      </div><!-- end gc-pagecontent -->
-   </div><!-- end gooey wrapper -->
-
-    </div> <!-- end codesite content -->
-
-<div id="gc-footer" dir="ltr"> 
-  <div class="text">
-    
-    &copy;2008 Google -
-    <a href="/">Code Home</a> -
-    <a href="http://www.google.com/accounts/TOS">Site Terms of Service</a> -
-    <a href="http://www.google.com/privacy.html">Privacy Policy</a> -
-    <a href="/more/">Site Directory</a>
-     <br />
-     <br />
-    <!-- end gc-footer -->
-  </div>
-</div><!-- end gc-containter -->
-  </body>
-</html>
-
diff --git a/docs/html/maps-api-tos.pdf b/docs/html/maps-api-tos.pdf
deleted file mode 100644
index 80c28363a021..000000000000
--- a/docs/html/maps-api-tos.pdf
+++ /dev/null
diff --git a/docs/html/offline.jd b/docs/html/offline.jd
index d41459b4d64c..57c55c7ff559 100644
--- a/docs/html/offline.jd
+++ b/docs/html/offline.jd
@@ -9,10 +9,10 @@ page.title=Welcome
 <img src="{@docRoot}images/android_icon_125.png" style="float:right; margin:1em 6em 6em;" />
 
 <p>If you've just downloaded the SDK, then continue with  
-<a href="{@docRoot}sdk/1.1_r1/installing.html">Installing the Android SDK</a>.</p>
+<a href="{@docRoot}sdk/{@sdkCurrent}/installing.html">Installing the Android SDK</a>.</p>
 
 <p>If you're upgrading from a previously installed version, then refer to the 
-<a href="{@docRoot}sdk/1.1_r1/upgrading.html">Upgrading</a> guide.</p>
+<a href="{@docRoot}sdk/{@sdkCurrent}/upgrading.html">Upgrading</a> guide.</p>
 
 <p>Once you've completed the SDK installation, you can start learning about
 development on the Android framework by reading the <a
diff --git a/docs/html/samples/index.jd b/docs/html/samples/index.jd
index c5c0b7132eb9..06afd07f8ded 100644
--- a/docs/html/samples/index.jd
+++ b/docs/html/samples/index.jd
@@ -18,6 +18,5 @@ page.onlyfortemplate=codesite
 
 <p>To run these samples, you should <a
 href="{@docRoot}guide/developing/eclipse-adt.html#creatingaproject">import them into
-Eclipse</a> or <a href="{@docRoot}guide/developing/other-ide.html">use
-activitycreator.py</a>, as described in the <a
-href="{@docRoot}sdk/1.1_r1/installing.html">Installing the SDK</a>.</p>
+Eclipse</a> or build them with Ant, as described in 
+<a href="{@docRoot}guide/developing/other-ide.html#Building">Developing in Other IDEs</a>.</p>
diff --git a/docs/html/sdk/1.5_r1/index.jd b/docs/html/sdk/1.5_r1/index.jd
index 412887a95257..834ab7991959 100644
--- a/docs/html/sdk/1.5_r1/index.jd
+++ b/docs/html/sdk/1.5_r1/index.jd
@@ -2,51 +2,72 @@ sdk.version=1.5
 sdk.rel.id=1
 sdk.date=April 2009
 
-sdk.win_download=
+sdk.win_download=android-sdk-windows-1.5_r1.zip
 sdk.win_bytes=
 sdk.win_checksum=
 
-sdk.mac_download=
+sdk.mac_download=android-sdk-mac_x86-1.5_r1.zip
 sdk.mac_bytes=
 sdk.mac_checksum=
 
-sdk.linux_download=
+sdk.linux_download=android-sdk-linux_x86-1.5_r1.zip
 sdk.linux_bytes=
 sdk.linux_checksum=
 
-page.title=Download Android SDK
+page.title=Android 1.5 SDK, Release 1
 @jd:body
 
 <h2>SDK Contents</h2>
 
 <h4>Development tools</h4>
 
-<p>The SDK includes a variety of tools for developing and debugging application code and designing an application UI. You can read about the tools in the  
+<p>The SDK includes a full set of tools for developing and debugging application code and designing an application UI. You can read about the tools in the  
 <a href="{@docRoot}guide/developing/tools/index.html">Dev Guide</a> and access them in the <code>&lt;sdk&gt;/tools/</code> directory. 
 
-<p>The tools package included in this SDK includes many updates from that provided in the previous SDK and requires you to migrate your applications to the new development environment. For details, see the <a href="upgrading">Upgrading the SDK</a> document.</p>
+<p>The tools package in this SDK includes updates from those provided in the previous SDK. The tools also require a different project structure. To use the new tools, you need to migrate your applications to the new development environment. For more information about how to migrate, see <a href="{@docRoot}sdk/1.5_r1/upgrading.html">Upgrading the SDK</a>.
 
-<h4 id="system_images">System Images</h4>
+<p>For more information about the new tools features, see the <a href="{@docRoot}sdk/RELEASENOTES.html">SDK Release Notes</a>. 
 
-<p>The Android system images listed below are included in this SDK. For more information about a system image &mdash; features, applications included, localizations, API changes, and so on &mdash; see its Version Notes. </p>
+<h4 id="system_images">Android Platforms</h4>
+
+<p>This SDK includes multiple Android platform versions that you use to develop applications. For each version, both a fully compliant Android library and system image are provided. The table below lists the platform versions included in this SDK. For more information about a platform version &mdash; features, applications included, localizations, API changes, and so on &mdash; see its Version Notes. </p>
 
 <table style="margin-right:1em;" width="80%">
 <tr>
-<th><nobr>System Image</nobr></th><th><nobr>API Level</nobr></th><th>Notes</th><th>Description</th>
+<th><nobr>Platform</nobr></th><th><nobr>API Level</nobr></th><th>Notes</th><th>Description</th>
 </tr>
 
 <tr>
 <td width="5%"><nobr>Android 1.5</nobr></td>
 <td  width="5%">3</td>
 <td  width="5%"><nobr><a href="{@docRoot}sdk/android-1.5.html">Version Notes</a></nobr></td>
-<td>Includes a set of standard development applications. </td>
+<td>Includes a standard Android 1.5 library and system image with a set of development applications. Does not include any external libraries (such as the Maps external library).</td>
 </tr>
 <tr>
 <td width="5%"><nobr>Android 1.1</nobr></td>
 <td  width="5%">2</td>
 <td  width="5%"><nobr><a href="{@docRoot}sdk/android-1.1.html">Version Notes</a></nobr></td>
-<td>Includes a set of standard development applications. </td>
+<td>Includes a compliant Android 1.1 library and system image with a set of development applications. Also includes the Maps external library (due to legacy build system issues).</a>
+external library. </td>
+
+</tr>
+</table>
+
+<h4 id="system_images">SDK Add-Ons</h4>
+
+<p>An SDK add-on provides a development environment for an Android external library or a customized (but fully compliant) Android system image. This SDK includes the SDK add-on listed below. The Android system API Level required by the add-on is noted.</p>
 
+<table style="margin-right:1em;" width="80%">
+<tr>
+<th><nobr>Add-On</nobr></th><th><nobr>API Level</nobr></th><th>Notes</th><th>Description</th>
+</tr>
+<tr>
+<td width="5%"><nobr>Google APIs</nobr></td>
+<td  width="5%">3</td>
+<td  width="5%">&nbsp;</td>
+<td>Includes the com.google.android.maps external library, a compliant 
+system image, a {@link android.location.Geocoder Geocoder}
+backend service implementation, documentation, and sample code. </td>
 </tr>
 </table>
 
@@ -55,7 +76,6 @@ page.title=Download Android SDK
 <p>You can look at a variety of tutorials and samples in the <a href="{@docRoot}guide/samples/index.html">Dev Guide</a> and access the sample code itself
 in the <code>&lt;sdk&gt;/platforms/android-1.5/samples/</code> directory of the SDK package. Note the new location &mdash; the SDK now includes multiple platform versions that you can develop against and each has its own sample code directory. </p>
 
-<!-- 
 <h4>Documentation</h4>
 
 <p>The SDK package includes a full set of local documentation. To view it, open the <code>&lt;sdk&gt;/documentation.html</code> file in a web browser. If you are developing in an IDE such as Eclipse, you can also view the reference documentation directly in the IDE. </p>
@@ -63,5 +83,4 @@ in the <code>&lt;sdk&gt;/platforms/android-1.5/samples/</code> directory of the
 <p>The most current documentation is always available on the Android Developers site:</p>
 
 <p style="margin-left:2em;"><a href="http://developer.android.com/index.html">http://developer.android.com/</a></p>
--->
 
diff --git a/docs/html/sdk/1.5_r1/installing.jd b/docs/html/sdk/1.5_r1/installing.jd
index a1f7cffb0576..bd366ff1add9 100644
--- a/docs/html/sdk/1.5_r1/installing.jd
+++ b/docs/html/sdk/1.5_r1/installing.jd
@@ -5,6 +5,328 @@ sdk.date=April 2009
 page.title=Installing the Android SDK
 @jd:body
 
-<p>See the <a href="{@docRoot}sdk/preview/index.html">Download page</a> for more information.</p>
+
+<p>This page describes how to install the Android SDK and set up your
+development environment. If you haven't downloaded the SDK, you can
+do so from the 
+<a href="{@docRoot}sdk/1.5_r1/index.html">Download</a> page. Once you've downloaded
+the SDK, return here.</p>
+
+<p>If you encounter any problems during installation, see the 
+<a href="#installnotes">Installation Notes</a> at the bottom of
+this page.</p>
+
+<h4 style="margin-top">Upgrading?</h4>
+<p>If you have already developed applications using an earlier version
+of the SDK, please read 
+<a href="{@docRoot}sdk/1.5_r1/upgrading.html"><strong>Upgrading the
+SDK</strong></a></b>, instead.
+</p>
+
+
+<h2 id="setup">Preparing for Installation</h2>
+
+<p>Before you begin, take a moment to confirm that your development machine meets the 
+<a href="{@docRoot}sdk/1.5_r1/requirements.html">System Requirements</a>.
+</p>
+
+<p>If you will be developing on Eclipse with the Android Development
+Tools (ADT) Plugin &mdash; the recommended path if you are new to
+Android &mdash; make sure that you have a suitable version of Eclipse
+installed on your computer (3.3 or newer). If you need to install Eclipse, you can
+download it from this location: </p>
+
+<p style="margin-left:2em;"><a href=
+"http://www.eclipse.org/downloads/">http://www.eclipse.org/downloads/</a
+></p>
+
+<p>A Java or RCP version of Eclipse is recommended. </p>
+
+<h2 id="installingsdk">Installing the SDK</h2>
+
+<p>After downloading the SDK, unpack the .zip archive to a suitable location on your machine. 
+By default, the SDK files are unpacked into a directory named 
+<code>android_sdk_<em>&lt;platform</em>&gt;_<em>&lt;release&gt;</em></code>. 
+The directory contains a local copy of the documentation (accessible by opening
+<code>documentation.html</code> in your browser) and the subdirectories 
+<code>tools/</code>, <code>add-ons/</code>, <code>platforms/</code>, and others. Inside
+each subdirectory of <code>platforms/</code> you'll find <code>samples/</code>, which includes
+code samples that are specific to each version of the platform.</p>
+
+<p>Make a note of the name and location of the unpacked SDK directory on your system &mdash; you 
+will need to refer to the SDK directory later, when setting up the Android plugin or when 
+using the SDK tools.</p>
+
+<p>Optionally, you may want to add the location of the SDK's primary <code>tools</code> directory 
+to your system PATH. The primary <code>tools/</code> directory is located at the root of the 
+SDK folder. Adding <code>tools</code> to your path lets you run Android Debug Bridge (adb) and 
+the other command line <a href="{@docRoot}guide/developing/tools/index.html">tools</a> without 
+needing to supply the full path to the tools directory. </p>
+<ul>
+    <li>On Linux, edit your <code>~/.bash_profile</code> or <code>~/.bashrc</code> file. Look
+    for a line that sets the PATH environment variable and add the
+    full path to the <code>tools/</code> directory to it. If you don't 
+    see a line setting the path, you can add one:</li>
+
+    <ul><code>export PATH=${PATH}:<em>&lt;your_sdk_dir&gt;</em>/tools</code></ul>
+
+    <li>On a Mac, look in your home directory for <code>.bash_profile</code> and
+    proceed as for Linux. You can create the <code>.bash_profile</code> if 
+    you haven't already set one up on your machine. </li>
+
+    <li>On Windows, right-click on My Computer, and select Properties.  
+  Under the Advanced tab, hit the Environment Variables button, and in the
+  dialog that comes up, double-click on Path (under System Variables). Add the full path to the 
+  <code>tools/</code> directory to the path. </li>
+  </ul>
+
+<p>Note that, if you update your SDK in the future, you 
+should remember to update your PATH settings to point to the new location, if different.</p>
+
+<p>If you will be using the Eclipse IDE as your development environment,
+the next section describes how to install the Android Development Tools plugin and set up Eclipse. 
+If you choose not to use Eclipse, you can 
+develop Android applications in an IDE of your choice and then compile, debug and deploy using
+the tools included in the SDK (skip to <a href="#next">Next Steps</a>).</p>
+
+
+<h2 id="installingplugin">Installing the ADT Plugin for Eclipse</h2>
+
+<p>Android offers a custom plugin for the Eclipse IDE, called Android
+Development Tools (ADT), that is designed to give you a powerful,
+integrated environment in which to build Android applications. It
+extends the capabilites of Eclipse to let you quickly set up new Android
+projects, create an application UI, add components based on the Android
+Framework API, debug your applications using the Android SDK tools, and even export
+signed (or unsigned) APKs in order to distribute your application.</p>
+
+<p>In general, using Eclipse with ADT is a highly recommended
+approach to Android development and is the fastest way to get started.
+(If you prefer to work in an IDE other than Eclipse,
+you do not need to install Eclipse or ADT, instead, you can directly
+use the SDK tools to build and debug your application.)</p>
+
+<p>Once you have Eclipse installed, as described in <a href="#setup">Preparing for 
+Installation</a>, follow the steps below to
+download the ADT plugin and install it in your respective Eclipse
+environment. </p>
+
+<table style="font-size:100%">
+<tr><th>Eclipse 3.3 (Europa)</th><th>Eclipse 3.4 (Ganymede)</th></tr>
+<tr>
+<td width="45%">
+<!-- 3.3 steps -->
+<ol>
+    <li>Start Eclipse, then select <strong>Help</strong> &gt; <strong>Software Updates</strong> 
+&gt; <strong>Find and Install...</strong>. </li>
+    <li>In the dialog that appears, select <strong>Search for new features to install</strong> 
+and click <strong>Next</strong>. </li>
+    <li>Click <strong>New Remote Site</strong>. </li>
+    <li>In the resulting dialog box, enter a name for the remote site (e.g. "Android Plugin") and 
+    enter the URL:
+        <pre>https://dl-ssl.google.com/android/eclipse/</pre>
+        <p>If you have trouble aqcuiring the plugin, try using "http" in the URL,
+        instead of "https" (https is preferred for security reasons).</p>
+        <p>Click <strong>OK</strong>.</p> </li>
+    <li>You should now see the new site added to the search list (and checked).
+        Click <strong>Finish</strong>. </li>
+    <li>In the subsequent Search Results dialog box, select the checkbox for the
+    <strong>Android Plugin</strong>.
+    This will select the nested tools: "Android DDMS" and "Android Developer Tools". 
+    Click <strong>Next</strong>.</li>
+    <li>Read and accept the license agreement, then click <strong>Next</strong>. </li>
+    <li>On the following Installation window, click <strong>Finish</strong>. </li>
+    <li>The ADT plugin is not digitally signed. Accept the installation anyway
+        by clicking <strong>Install All</strong>. </li>
+    <li>Restart Eclipse. </li>
+</ol>
+
+</td>
+<td>
+
+<!-- 3.4 steps -->
+<ol>
+    <li>Start Eclipse, then select <strong>Help</strong> &gt; <strong>Software Updates...</strong>.</li>
+    <li>In the dialog that appears, click the <strong>Available Software</strong> tab. </li>
+    <li>Click <strong>Add Site...</strong> </li>
+    <li>Enter the Location:
+      <pre>https://dl-ssl.google.com/android/eclipse/</pre>
+        <p>If you have trouble aqcuiring the plugin, try using "http" in the Location URL,
+        instead of "https" (https is preferred for security reasons).</p>   
+      <p>Click <strong>OK</strong>.</p></li>
+    <li>Back in the Available Software view, you should see the plugin listed by the URL,
+    with "Developer Tools" nested within it. Select the checkbox next to 
+      Developer Tools and click <strong>Install...</strong></li>
+    <li>On the subsequent Install window, "Android DDMS" and "Android Developer Tools"
+    should both be checked. Click <strong>Next</strong>. </li>
+    <li>Read and accept the license agreement, then click <strong>Finish</strong>.</li>
+    <li>Restart Eclipse. </li>
+</ol>
+
+</td>
+</tr>
+</table>
+
+<p>Now modify your Eclipse preferences to point to the Android SDK directory:</p>
+<ol>
+    <li>Select <strong>Window</strong> &gt; <strong>Preferences...</strong> to open the Preferences
+        panel (Mac: <strong>Eclipse</strong> &gt; <strong>Preferences</strong>).</li>
+    <li>Select <strong>Android</strong> from the left panel. </li>
+    <li>For the <em>SDK Location</em> in the main panel, click <strong>Browse...</strong> and 
+locate your downloaded SDK directory. </li>
+    <li>Click <strong>Apply</strong>, then <strong>OK</strong>.</li>
+</ol>
+
+<p>Done! If you haven't encountered any problems, then you're ready to
+begin developing Android applications. See the 
+<a href="#next">Next Steps</a> section for suggestions on how to start. </p>
+
+
+<h3 id="troubleshooting">Troubleshooting ADT Installation</h3>
+<p> 
+If you are having trouble downloading the ADT plugin after following the steps above, here are 
+some suggestions: </p>
+
+<ul>
+  <li>If Eclipse can not find the remote update site containing the ADT plugin, try changing 
+  the remote site URL to use http, rather than https. That is, set the Location for the remote site to:
+  <pre>http://dl-ssl.google.com/android/eclipse/</pre></li>
+  <li>If you are behind a firewall (such as a corporate firewall), make
+  sure that you have properly configured your proxy settings in Eclipse.
+  In Eclipse 3.3/3.4, you can configure proxy information from the main
+  Eclipse menu in <strong>Window</strong> (on Mac, <strong>Eclipse</strong>) &gt; 
+  <strong>Preferences</strong> &gt; <strong>General</strong> &gt; 
+  <strong>Network Connections</strong>.</li>
+</ul>
+<p> 
+If you are still unable to use Eclipse to download the ADT plugin as a remote update site, you 
+can download the ADT zip file to your local machine and manually install the it:
+</p>
+<ol>
+  <li><a href="{@docRoot}sdk/adt_download.html">Download the ADT zip file</a> (do not unpack it).</li>
+  <li>Follow steps 1 and 2 in the default install instructions (above).</li>
+  <li>In Eclipse 3.3, click <strong>New Archive Site...</strong>. <br/>
+      In Eclipse 3.4, click <strong>Add Site...</strong>, then <strong>Archive...</strong></li>
+  <li>Browse and select the downloaded zip file.</li>
+  <li>Follow the remaining procedures, above, starting from steps 5.</li>
+</ol>
+<p>To update your plugin once you've installed using the zip file, you will have to 
+follow these steps again instead of the default update instructions.</p>
+
+<h4>Other install errors</h4>
+
+<p>Note that there are features of ADT that require some optional 
+Eclipse components (for example, WST). If you encounter an error when 
+installing ADT, your Eclipse installion might not include these components. 
+For information about how to quickly add the necessary components to your 
+Eclipse installation, see the troubleshooting topic 
+<a href="{@docRoot}guide/appendix/faq/troubleshooting.html#installeclipsecomponents">ADT 
+Installation Error: "requires plug-in org.eclipse.wst.sse.ui"</a>.</p>
+
+<h4>For Linux users</h4>
+<p>If you encounter this error when installing the ADT Plugin for Eclipse: 
+<pre>
+An error occurred during provisioning.
+Cannot connect to keystore.
+JKS</pre>
+<p>
+...then your development machine lacks a suitable Java VM. Installing Sun
+Java 6 will resolve this issue and you can then reinstall the ADT
+Plugin.</p>
+
+
+<h2 id="next">Next Steps</h2>
+<p>Once you have completed installation, you are ready to
+begin developing applications. Here are a few ways you can get started: </p>
+
+<p><strong>Learn about Android</strong></p>
+<ul>
+  <li>Take a look at the <a href="{@docRoot}guide/index.html">Dev
+  Guide</a> and the types of information it provides</li>
+  <li>Read an introduction to Android as a platform in <a
+  href="{@docRoot}guide/basics/what-is-android.html">What is
+  Android?</a></li>
+  <li>Learn about the Android framework and how applications run on it in
+  <a href="{@docRoot}guide/topics/fundamentals.html">Application
+  Fundamentals</a></li>
+  <li>Take a look at the Android framework API specification in the <a
+  href="{@docRoot}reference/index.html">Reference</a> tab</li>
+</ul>
+
+<p><strong>Explore the SDK</strong></p>
+<ul>
+  <li>Get an overview of the <a
+  href="{@docRoot}guide/developming/tools/index.html">development
+  tools</a> that are available to you</li>
+  <li>Read how to develop <a
+  href="{@docRoot}guide/developing/eclipse-adt.html">in Eclipse/ADT</a> or
+  <a href="{@docRoot}guide/developing/other-ide.html">in other IDEs</a>
+  </li>
+</ul>
+
+<p><strong>Explore some code</strong></p>
+<ul>
+  <li>Set up a <a href="{@docRoot}guide/tutorials/hello-world.html">Hello
+  World application</a> (highly recommended, especially for Eclipse users)</li>
+  <li>Follow the <a href="{@docRoot}guide/tutorials/notepad/index.html">
+  Notepad Tutorial</a> to build a full Android application </li>
+  <li>Create a new project for one of the other sample applications
+  included in <code><em>&lt;sdk&gt;</em>/platforms/<em>&lt;platfrom&gt;</em>/samples</code>, 
+  then compile and run it in your development environment</li>
+</ul>
+
+<p><strong>Visit the Android developer groups</strong></p>
+<ul>
+  <li>Take a look at the <a
+  href="{@docRoot}community/index.html">Community</a> tab to see a list of
+  Android developers groups. In particular, you might want to look at the
+  <a href="http://groups.google.com/group/android-developers">Android
+  Developers</a> group to get a sense for what the Android developer
+  community is like.</li>
+</ul>
+
+
+<h2 id="installnotes">Installation Notes</h2>
+
+<h3>Ubuntu Linux Notes</h3>
+
+<ul>
+  <li>If you need help installing and configuring Java on your
+    development machine, you might find these resources helpful: 
+    <ul>
+      <li><a href="https://help.ubuntu.com/community/Java">https://help.ubuntu.com/community/Java </a></li>
+      <li><a href="https://help.ubuntu.com/community/Java">https://help.ubuntu.com/community/JavaInstallation</a></li>
+    </ul>
+  </li>
+  <li>Here are the steps to install Java and Eclipse, prior to installing
+  the Android SDK and ADT Plugin.
+    <ol>
+      <li>If you are running a 64-bit distribution on your development
+      machine, you need to install the <code>ia32-libs</code> package using
+      <code>apt-get:</code>:
+      <pre>apt-get install ia32-libs</pre>
+      </li>
+      <li>Next, install Java: <pre>apt-get install sun-java6-bin</pre></li>
+      <li>The Ubuntu package manager does not currently offer an Eclipse 3.3
+      version for download, so we recommend that you download Eclipse from
+      eclipse.org (<a
+      href="http://www.eclipse.org/downloads/">http://www.eclipse.org/
+      downloads/</a>). A Java or RCP version of Eclipse is recommended.</li>
+      <li>Follow the steps given in previous sections to install the SDK 
+      and the ADT plugin. </li>
+    </ol>
+  </li>
+</ul>
+
+<h3>Other Linux Notes</h3>
+
+<ul>
+  <li>If JDK is already installed on your development computer, please
+  take a moment to make sure that it meets the version requirements listed
+  in the <a href="{@docRoot}sdk/1.1_r1/requirements.html">System Requirements</a>.
+  In particular, note that some Linux distributions may include JDK 1.4 or Gnu
+  Compiler for Java, both of which are not supported for Android development.</li>
+</ul>
+
 
 
diff --git a/docs/html/sdk/1.5_r1/upgrading.jd b/docs/html/sdk/1.5_r1/upgrading.jd
index 532313110cb3..0b7312b3166f 100644
--- a/docs/html/sdk/1.5_r1/upgrading.jd
+++ b/docs/html/sdk/1.5_r1/upgrading.jd
@@ -2,175 +2,351 @@ page.title=Upgrading the SDK
 sdk.version=1.5_r1
 @jd:body
 
-<!--
-<div class="sidebox-wrapper">
-  <div class="sidebox-inner">
 
-     <h2>Useful Links</h2>
+<div id="qv-wrapper">
+<div id="qv">
+
+  <h2>Upgrading quickview</h2>
+  <ul>
+    <li>The Android 1.5 SDK uses a new project structure and a new ADT plugin (ADT 0.9). </li>
+    <li>To move existing projects into the SDK, you must make some minor changes in your 
+    development environment.</li>
+    <li>The new ADT plugin (ADT 0.9) <em>is not compatible</em> with projects created in previous SDKs.</li>
+    <li>You need to uninstall your existing ADT plugin, before installing ADT 0.9.</li>
+  </ul>
+
+  <h2>In this document</h2>
+  <ol>
+    <li><a href="#Install">Install the SDK</a></li>
+    <li><a href="#UpdateAdt">Update Your Eclipse ADT Plugin</a></li>
+    <li><a href="#UpdateYourProjects">Update Your Projects</a>
+      <ol>
+        <li><a href="#EclipseUsers">Eclipse Users</a></li>
+        <li><a href="#AntUsers">Ant Users</a></li>
+      </ol>
+    </li>
+    <li><a href="#MigrateYourApplications">Migrate Your Applications</a></li>
+  </ol>
+  
+  <h2>Migrating references</h2>
+  <ol>
+    <li><a href="{@docRoot}sdk/api_diff/3/changes.html">Android 1.5 API Differences</a></li>
+ <!--   <li><a href="">TODO: LINK TO DAN'S POST &raquo;</a></li> -->
+    <li><a 
+href="http://android-developers.blogspot.com/2009/04/ui-framework-changes-in-android-15.html">UI 
+framework changes in Android 1.5 &raquo;</a></li>
+  </ol>
 
-      <ul class="noindent">
-        <li><a href="migrating/0.9-1.0/changes-overview.html">Overview of Changes</a>
-		      <p>A high-level look at what's changed in Android, with 
-		       discussion of how the changes may affect your apps.</p></li>
-
-        <li><a href="migrating/0.9-1.0/changes.html">API Diff Report</a> 
-                <p>A detailed report that lists all the specific changes in the latest SDK.</p></li>
-
-        <li><a href="RELEASENOTES.html">Release Notes</a> 
-                <p>Version details, known issues, and resolved issues. </p></li>
-
-        <li><a href="http://groups.google.com/group/android-developers">Android Developers Group</a> 
-            <p>A forum where you can discuss migration issues and learn from other Android developers. </p></li>
- 
-        <li><a href="http://code.google.com/p/android/issues/list">Android Issue Tracker</a>
-            <p>If you think you may have found a bug, use the issue tracker to report it.</p></li>
-      </ul>
-
-   </div>
 </div>
--->
+</div>
 
+<p>This document describes how to move your development environment and existing
+Android applications from an Android 1.0 or 1.1 SDK to the Android 1.5 SDK.
+If you are migrating applications from an SDK older than 1.0, please also read the upgrading
+document available in the Android 1.0 SDK package.</p>
 
-    <div id="qv-wrapper">
-    <div id="qv">
+<p>There are several compelling reasons to upgrade, such as new SDK tools
+that make developing more efficient and new APIs that allow you to expand the feature-set
+of your applications. However, even if you or your applications don't require these enhancements,
+it's important that you upgrade to ensure that your applications run properly on the 
+Android 1.5 platform.</p>
 
-<h2>Upgrading quickview</h2>
-<ul>
-<li>The Android 1.5 SDK uses a new project structure and a new ADT plugin (ADT 0.9). </li>
-<li>To move existing projects into the SDK, you must make some minor changes in your development environment.</li>
-<li>The new ADT plugin (ADT 0.9) <em>is not compatible</em> with projects created in previous SDKs.</li>
-<li>You need to uninstall your existing ADT plugin, before installing ADT 0.9.</li>
+<p>The Android 1.5 platform will soon be deployable to devices around the world.
+If you have already released Android applications to the public, you should
+test the forward-compatibility of your applications on the latest version of the platform
+as soon as possible. It's unlikely that you'll encounter breakage in your applications, but
+in the interest of maintaining the best user experience, you should take no risks.
+So, please install the new Android SDK and test your applications on Android 1.5.</p>
 
-</ul>
+<p>For more information on new SDK features and system changes, 
+see the <a href="{@docRoot}sdk/android-1.5.html">Android 1.5 Version Notes</a>.</p>
 
-<!--<h2>Related Information</h2>
-<ol>
-<li><a href="{@docRoot}sdk/api_diff/3/changes.html">Android 1.5 API Differences</a></li>
-</ol>
--->
-</div>
-</div>
 
-<p>See the <a href="{@docRoot}sdk/preview/index.html">Download page</a> for more information.</p>
+<h2 id="Install">Install the SDK</h2>
 
-<!-- <p>This document describes how to move your development environment and existing
-Android applications from an Android 1.1 or 1.0 SDK to the Android 1.5 SDK.
-If you are migrating applications from an earlier SDK, please read the upgrading
-document available in the Android 1.0 SDK package.
-</p>
+<p>If you haven't yet downloaded the SDK, <a href="{@docRoot}sdk/1.5_r1/index.html">download from here</a> 
+and unpack it into a safe location.</p>
 
-<p>To ensure that your existing applications run properly with the Android 1.5 system available 
-on mobile devices, you need to install the Android 1.5 SDK and port your existing Android 
-applications to it. The sections below will guide you through the process.</p>
+<p><strong>Before you begin:</strong>
+If you had previously setup your PATH variable to point to the SDK tools directory, 
+then you need to update it to point to the new SDK. For example, for a 
+<code>.bashrc</code> or <code>.bash_profile</code> file:</p>
+<pre>export PATH=$PATH:<em>&lt;your_sdk_dir></em>/tools</pre>
 
-</ul>
+<p>If you don't use Eclipse for development,
+skip to <a href="#updateYourProjects">Update Your Projects</a>.</p>
 
-<h2 id="install-new">Installing the SDK</h2>
 
-<p><a href="{@docRoot}sdk/1.5_r1/index.html">Download the SDK</a> and unpack it into a safe location.</p>
+<h2 id="UpdateAdt">Update Your Eclipse ADT Plugin</h2>
 
-<p>After unpacking the new SDK and saving it an appropriate location, you should:</p>
+<p><em>If you installed ADT-0.9_pre with the early look 1.5 SDK, there have been
+additional changes, so please continue with this guide and update to the final ADT 0.9.</em></p>
 
-<ul>
-  <li>Wipe your emulator data. <p>Some data formats have changed since the last
-  SDK release, so any previously saved data in your emulator must be removed. Open a console/terminal
-  and navigate to the <code>/tools</code> directory of your new SDK. Launch the 
-  emulator with the <code>-wipe-data</code> option. 
-  <p>Windows: <code>emulator -wipe-data</code><br/>
-   Mac/Linux: <code>./emulator -wipe-data</code></p>
-  </li>
-  <li>Update your PATH variable (Mac/Linux; optional). <p>If you had previously setup your 
-  PATH variable to point to the SDK tools directory, then you'll need to update it to 
-  point to the new SDK. For example, for a <code>.bashrc</code> or <code>.bash_profile</code> file:
-  <code>export PATH=$PATH:<em>&lt;your_new_sdk_dir></em>/tools</code></p>
-  </li>
-  <li>If (and only if) you are developing using Ant, you will also need to modify 
-  your build.xml properties to point to the new SDK. 
-  <p>Open the <code>default.properties</code> file associated with your build.xml 
-  file (typically located in the same directory). In the default.properties
-  file, update the <code>sdk-folder</code> property with the full path to
-  the new SDK directory.</p></li>
-</ul>
+<p>A new ADT plugin (version 0.9) is required for the Android 1.5 SDK.
+Because the component structure has been changed since Android 1.1, 
+the Android 1.5 SDK does not work with ADT 0.8 (or older) and previously installed SDKs will not
+work with ADT 0.9. However, the Android 1.5 SDK includes an Android 1.1 SDK image that you
+can build against while using ADT 0.9. </p>
 
-<a name="Updating_the_ADT_plugin" id="Updating_the_ADT_plugin"></a>
-<h2 id="update-plugin">Update your ADT Eclipse Plugin</h2>
+<p class="note">For information about using different system images (such as Android 1.1) 
+while running this SDK, see Developing <a href="{@docRoot}guide/developing/eclipse-adt.html">
+In Eclipse, with ADT</a> or <a href="{@docRoot}guide/developing/other-ide.html">In 
+Other IDEs</a>, as appropriate for your development environment.</p>
 
-<p>If you develop on Eclipse and are migrating from an Android 1.0
-SDK, no update of the ADT plugin is needed &mdash; skip to <a href="#updateEclipsePrefs">Update your Eclipse SDK Preferences</a>. </p>
+<p>In order to upgrade your Eclipse IDE to use the new 0.9 ADT, follow the steps below
+for your respective version of Eclipse.</p>
 
-<p>If you are migrating from an earlier version of the SDK, you will
-need to update the ADT plugin. <p>You may also want to upgrade your 
-ADT plugin when a new version becomes available for your existing version 
-of the SDK.</p>
+<h3 id="uninstallAdt">Uninstall your previous ADT plugin</h3>
 
-<p>The steps below describe how to update the ADT plugin to the latest
-version available. </p>
+<p>You must uninstall your existing ADT plugin (0.8 or older). If you do not uninstall it,
+you will get a conflict with the Android Editors when installing the new ADT.
+(If you have already installed ADT-0.9_pre with the early look 1.5 SDK, you can skip this
+uninstall procedure and continue to <a href="#installAdt">Install the 0.9 ADT plugin</a>).</p>
 
 <table style="font-size:100%">
 <tr><th>Eclipse 3.3 (Europa)</th><th>Eclipse 3.4 (Ganymede)</th></tr>
 <tr>
 <td width="50%">
+<!-- 3.3 steps -->
 <ol>
-    <li> Select <strong>Help</strong> &gt; <strong>Software Updates</strong> &gt; <strong>Find and Install...</strong>. </li>
-    <li> Select <strong>Search for updates of the currently installed features</strong> and click <strong>Finish</strong>. </li>
-    <li> If any update for ADT is available, select and install. </li>
-    <li> Restart Eclipse.</li>
+    <li>Select <strong>Help</strong> &gt; <strong>Software Updates</strong> &gt; 
+      <strong>Manage Configuration</strong>. </li>
+    <li>Expand the list in the left panel to reveal the installed tools.</li>
+    <li>Right-click "Android Editors" and click <strong>Uninstall</strong>. Click <strong>OK</strong> 
+    to confirm.</li>
+    <li>Restart Eclipse. 
+      <p>(Do not uninstall "Android Development Tools".)</p></li>
 </ol>
-<p> Alternatively, </p>
+</td>
+<td>
+<!-- 3.4 steps -->
 <ol>
-    <li> Select <strong>Help</strong> &gt; <strong>Software Updates</strong> &gt; <strong>Manage Configuration</strong>. </li>
+    <li>Select <strong>Help</strong> &gt; <strong>Software Updates</strong>.</li>
+    <li>Select the <strong>Installed Software</strong> tab.</li>
+    <li>Select "Android Editors". Click <strong>Uninstall</strong>.</li>
+    <li>In the next window, be sure "Android Editors" is checked, then click <strong>Finish</strong>
+    to uninstall.</li>
+    <li>Restart Eclipse.
+      <p>(Do not uninstall "Android Development Tools".)</p></li>
+</ol>
+</td>
+</tr>
+</table>
+
+
+<h3 id="installAdt">Install the 0.9 ADT plugin</h3>
 
-    <li> Navigate down the tree and select <strong>Android Development Tools &lt;version&gt;</strong> </li>
-    <li> Select <strong>Scan for Updates</strong> under <strong>Available Tasks</strong>.</li>
+<p>Only install the new plugin once you've completed the procedure to
+<a href="#uninstallAdt">Uninstall your previous ADT plugin</a>.</p>
+
+<table style="font-size:100%">
+<tr><th>Eclipse 3.3 (Europa)</th><th>Eclipse 3.4 (Ganymede)</th></tr>
+<tr>
+<td width="50%">
+<!-- 3.3 steps -->
+<ol>
+    <li>Select <strong>Help</strong> &gt; <strong>Software Updates</strong> &gt; 
+      <strong>Find and Install</strong>. </li>
+    <li>Select <strong>Search for new features to install</strong>.</li>
+    <li>Select the Android plugin entry by checking the box next to it, 
+      then click <strong>Finish</strong>.
+      <p>(Your original entry for the plugin should still be here. If not, see the guide
+      to <a href="{docRoot}sdk/1.5_r1/installing.html#installingplugin">Installing the ADT Plugin</a>.)
+      </p></li>
+    <li>In the results, be sure that "Developer Tools" is checked, then click <strong>Next</strong>.</li>
+    <li>Read and accept the license agreement, then click <strong>Next</strong>.
+    <li>In the next window, click <strong>Finish</strong> to start installation.</li>
+    <li>The ADT plugin is not digitally signed. Accept the installation anyway by clicking 
+    <strong>Install All</strong>.</li>
+    <li>Restart Eclipse.</li>
 </ol>
 </td>
 <td>
+<!-- 3.4 steps -->
 <ol>
-    <li>Select <strong>Help</strong> &gt; <strong>Software Updates...</strong></li>
-    <li>Select the <strong>Installed Software</strong> tab.</li>
-    <li>Click <strong>Update...</strong></li>
-    <li>If an update for ADT is available, select it and click <strong>Finish</strong>.</li>
+    <li>Select <strong>Help</strong> &gt; <strong>Software Updates</strong>.</li>
+    <li>Select the <strong>Available Software</strong> tab.</li>
+    <li>Expand the entry for the Andriod plugin (may be listed as the location URL)
+      and select "Developer Tools" by checking the box next to it, then click <strong>Install</strong>.
+    </li>On the next window, "Android DDMS" and "Android Developer Tools" 
+    should both be checked. Click <strong>Next</strong>.</li>
+    <li>Read and accept the license agreement, then click <strong>Finish</strong>.</li>
     <li>Restart Eclipse.</li>
 </ol>
 </td>
 </tr>
 </table>
 
-<h2 id="updateEclipsePrefs">Update your Eclipse SDK Preferences</h2>
+<p>If you encounter problems, ensure your ADT is fully uninstalled and then
+follow the guide to 
+<a href="{@docRoot}sdk/1.5_r1/installing.html#installingplugin">Installing the ADT Plugin
+for Eclipse</a>.</p>
+
+<h3 id="updateEclipsePrefs">Update your Eclipse SDK Preferences</h3>
 
 <p>The last step is to update your Eclipse preferences to point to the new SDK directory:</p>
     <ol>
-      <li>Select <strong>Window</strong> > <strong>Preferences...</strong> to open the Preferences panel. (Mac OSX: <strong>Eclipse</strong> > <strong>Preferences</strong>)</li>
+      <li>Select <strong>Window</strong> > <strong>Preferences</strong> to open the Preferences 
+      panel (Mac: <strong>Eclipse</strong> > <strong>Preferences</strong>).</li>
       <li>Select <strong>Android</strong> from the left panel.</li>
-      <li>For the SDK Location in the main panel, click <strong>Browse...</strong> and locate the SDK directory.</li>
+      <li>For the <em>SDK Location</em> in the main panel, click <strong>Browse</strong> 
+      and locate your SDK directory.</li>
       <li>Click <strong>Apply</strong>, then <strong>OK</strong>.</li>
     </ol>
 
-<h2 id="migrate">Migrate Your Applications, if Necessary</h2>
 
-<p>If (and only if) you have written apps in an SDK released previous to
-the Android 1.0 SDK, you will need to migrate your applications. After
-installing the new SDK and updating the ADT Plugin (if applicable), you
-may encounter breakages in your application code, due to 
-framework and API changes. You'll need to update your code to match the
-latest APIs.</p>
+<h2 id="UpdateYourProjects">Update Your Projects</h2>
+
+<p>You will now need to update any and all Android projects that you have
+developed using a previous version of the Android SDK.</p>
+
+
+<h3 id="EclipseUsers">Eclipse users</h3>
+
+<p>If you use Eclipse to develop applications, use the following procedure to 
+update each project:</p>
+
+<ol>
+  <li>Right-click on the individual project (in the Package Explorer)
+   and select <strong>Properties</strong>.</li>
+  <li>In the properties, open the Android panel and select a "build target" to compile 
+    against. This SDK offers the Android 1.1 and Android 1.5 platforms to choose from. When 
+    you are initially updating your projects to the new SDK, we recommend that you select a build 
+    target with the Android 1.1 platform. Click <strong>Apply</strong>, then 
+    <strong>OK</strong>.</li>
+</ol>
+
+<p>The new plugin creates a <code>gen/</code> folder in your project, in which it puts the 
+<code>R.java</code> file
+and all automatically generated AIDL java files. If you get an error such as 
+<code>The type R is already defined</code>, 
+then you probably need to delete your old <code>R.java</code> or your old auto-generated
+AIDL Java files in the <code>src/</code> folder.
+(This <em>does not</em> apply to your own hand-crafted parcelable AIDL java files.)</p>
+
+<p>Note that, with the Android 1.5 SDK, there is a new process for running 
+applications in the Android Emulator. 
+Specifically, you must create an Android Virtual Device (AVD) before you can launch an instance
+of the Emulator. Before attempting to run your applications with the new SDK, 
+please continue with the section below to 
+<a href="#MigrateYourApplications">Migrate Your Applications</a>.</p>
+
+
+<h3 id="AntUsers">Ant users</h3>
+
+<p>If you build your projects using the Ant tool (rather than with Eclipse), note the 
+following changes with the new SDK tools.</p>
+
+<h4>build.xml has changed</h4>
+
+<p>You must re-create your <code>build.xml</code> file.</p>
+
+<p>If you had customized your <code>build.xml</code>, first make a copy of it:</p>
+
+<pre>
+$ cd <em>my-project</em>
+$ cp build.xml build.xml.old
+</pre>
 
-<p>One way to start is to open your project in Eclipse and see where the ADT
-identifies errors in your application. You can also look up
-specific changes in the Android APIs in the 
-android-1.5.html#api-changes 
-Android 1.5 Version Notes
+<p>Now use the new <code>android</code> tool (located in <code><em>your_sdk</em>/tools/</code>) 
+to create a new <code>build.xml</code> that references 
+a specific platform target:</p>
 
-document.</p>
+<pre>$ android update project --path /path/to/my-project --target 1</pre>
+
+<p>The "target" corresponds to an Android platform library (including any add-ons, such as 
+Google APIs) that you would like to build your project against. You can view a list of available 
+targets (and their corresponding integer ID) with the command, <code>android list targets</code>. 
+When you are initially updating your projects to the new SDK, we recommend that you select the 
+first target ("1"), which uses the Android 1.1 platform library.</p>
+
+<p>A <code>gen/</code> folder will be created the first time you build and your <code>R.java</code> and
+your AIDL Java files will be generated in here. You <strong>must</strong> remove
+the old <code>R.java</code> and old auto-generated AIDL java files from the 
+<code>src/</code> folder. (This
+does not apply to your own hand-crafted parcelabe AIDL java files.)</p>
+
+<p class="note"><strong>Note:</strong> The "activitycreator" tool has been replaced 
+by the new "android" tool. For information on creating new projects with the android tool,
+see the documentation about <a href="{@docRoot}guide/developing/other-ide.html">Developing 
+In Other IDEs</a>.</p>
+
+<p>Note that, with the Android 1.5 SDK, there is a new process for running 
+applications in the Android Emulator. 
+Specifically, you must create an Android Virtual Device (AVD) before you can launch an instance
+of the Emulator. Before attempting to run your applications with the new SDK, 
+please continue with the section below to 
+<a href="#MigrateYourApplications">Migrate Your Applications</a>.</p>
+
+
+<h2 id="MigrateYourApplications">Migrate Your Applications</h2>
+
+<p>After you have completed the process above to <a href="#UpdateYourProjects">Update Your 
+Projects</a>, you are strongly encouraged to run each of your applications in an instance
+of the emulator running the Android 1.5 system image. It's possible (however, unlikely) 
+that you'll encounter some breakage in your application when you run your applications on
+the Android 1.5 system image. Whether you believe your application will be affected by 
+platform changes or not, it's very important that you test the application's 
+forward-compatibility on Android 1.5.</p>
+
+<p>To test forward-compatibility, simply run your existing application (as-is) on an Android
+Emulator that's running the Android 1.5 system image. The following procedure will guide
+you through the process to running your existing applications on an emulator. <em>Please read
+the following guide completely before you begin</em>.</p>
+
+<p>To test your application on an emulator running Android 1.5:</p>
+<ol>
+  <li><a href="#UpdateYourProjects">Update Your Project</a> (you should have done this 
+  already, in the section above).</li>
+  <li>Run your existing project, as-is, on an emulator running the Android 1.5 system image.
+    <p>As mentioned in the guide to <a href="#UpdateYourProjects">Update Your Projects</a>, 
+    you should have selected a "build
+    target" of "1", which compiles your application against the Android 1.1 system image, so there
+    should be no new errors in your code.</p>
+    <p>Eclipse users: follow the 
+    <a href="{@docRoot}guide/developing/eclipse-adt.html#Running">Eclipse guide to 
+    Running Your Application</a>.</p>
+    <p>Ant users: follow the 
+    <a href="{@docRoot}guide/developing/other-ide.html#Running">Ant guide to 
+    Running Your Application</a>
+    <p>During the procedure to Running Your Application, select a "deployment target" 
+    for the AVD that includes the Android 1.5 platform. 
+    If your application utilizes the Google Maps APIs (i.e.,
+    MapView), be certain to select a target that includes the Google APIs.</p>
+    <p>Once you complete the procedures to run your application in your respective environment,
+    linked above, return here.</p>
+  </li>
+  <li>With your application running in the emulator, perform all regular testing on the application
+  to ensure that it functions normally (in both landscape and portrait orientations).</li>
+</ol>
+
+<p>Chances are, your application runs just fine on the Android 1.5 platform &mdash; 
+new devices will be able to safely install and run your application and
+current users who update their devices will be able to continue using your application as usual.
+However, if something doesn't work the way you expect, then you might need to revisit
+your project and make any necessary changes to your code.</p>
+
+<p>You can check for code breakages caused by API changes by opening your project 
+in Eclipse, changing the "build target" to one using the Android 1.5 platform,
+and see where the ADT identifies errors in your code.</p>
+
+<p>There have been several API additions made for this release, but there have been
+very few actual API <em>changes</em>. Only a couple (relatively unused) elements 
+have been removed and a few have been deprecated, so your applications written with the 
+Android 1.1 system library should work just fine.
+Your application will be at highest risk of breakage if it uses Android APIs 
+that are not available in the public API documentation
+or if it explicitly depends on system bugs. For information
+about changes made to Android 1.5, refer to the following documents:</p>
+<ul>
+  <li><a href="{@docRoot}sdk/api_diff/3/changes.html">Android 1.5 API Differences</a></li>
+  <li><a href="{@docRoot}sdk/android-1.5.html#api-changes">Android 1.5 Version Notes</a></li>
+ <!-- <li><a href="">TODO: LINK TO DAN'S POST ON FORWARD COMPATIBILITY &raquo;</a></li>  -->
+  <li><a 
+href="http://android-developers.blogspot.com/2009/04/ui-framework-changes-in-android-15.html">UI 
+framework changes in Android 1.5 &raquo;</a></li>
+</ul>
 
 <p>If you have additional trouble updating your code, visit the 
 <a href="http://groups.google.com/group/android-developers">Android Developers Group</a>
 to seek help from other Android developers.</p>
-
-<p>If you have modified one of the ApiDemos applications and would like to migrate it 
-to the new SDK, note that you will need to uninstall the version of ApiDemos that comes 
-preinstalled in the emulator. For more information, or if you encounter an "reinstallation" 
-error when running or installing ApiDemos, see the troubleshooting topic 
-<a href="{@docRoot}guide/appendix/faq/troubleshooting.html#apidemosreinstall">I can't install ApiDemos 
-apps in my IDE because of a signing error</a> for information about how to solve the problem.</p>
--->
\ No newline at end of file
diff --git a/docs/html/sdk/RELEASENOTES.jd b/docs/html/sdk/RELEASENOTES.jd
index bad71a2a59da..c6a887a44662 100644
--- a/docs/html/sdk/RELEASENOTES.jd
+++ b/docs/html/sdk/RELEASENOTES.jd
@@ -1,21 +1,209 @@
 page.title=SDK Release Notes
 @jd:body
 
-<p>This document provides version-specific information about Android SDK releases. For the latest known issues, please ensure that you're viewing this page at: <a href="http://developer.android.com/sdk/RELEASENOTES.html">http://developer.android.com/sdk/RELEASENOTES.html</a>.</p>
+<p>This document provides version-specific information about Android SDK
+releases. For the latest known issues, please ensure that you're viewing this
+page at: 
+<a href="http://developer.android.com/sdk/RELEASENOTES.html">http://developer.android.com/sdk/RELEASENOTES.html</a>.</p>
+
+<h2 id="1.5_r1">Android 1.5 SDK, Release 1</h2>
+
+<p>This SDK provides updates to the development tools and Android system that
+you use to create applications for compliant Android-powered devices. </p>
+
+<h3>Release Overview</h3>
+
+<p>This SDK release includes many new features for developers. Highlights of the
+changes include: </p>
+
+  <ul>
+    <li>Multiple versions of the Android platform are included (Android 1.1,
+Android 1.5). The tools are updated to let you deploy your application
+on any platform in the SDK, which helps you ensure forward-compitility and, 
+if applicable, backward-compatibility.</li>
+    <li>Introduces <a href="{@docRoot}guide/developing/tools/avd.html">Android
+Virtual Devices</a> &mdash; (AVD) configurations of options that you
+run in the emulator to better model actual devices. Each AVD gets its
+own dedicated storage area, making it much easier to work with multiple emulators 
+that are running concurrently.</li>
+    <li>Support for SDK add-ons, which extend the
+Android SDK to give you access to one or more external Android libraries and/or
+a customized (but compliant) system image that can run in the emulator. </li>
+    <li>The new Eclipse ADT plugin (version 0.9.0) offers new Wizards to let you
+create projects targetted for specific Android configurations, generate XML
+resources (such as layouts, animations, and menus), generate alternate layouts,
+and export and sign your application for publishing.</li>
+    <li>Improved JUnit support in ADT</li>
+    <li>Easier profiling of performance</li>
+    <li>Easier management of localized applications. You can now include or
+exclude locale resources when building your APK from a single
+Android project.</li>
+    <li>A new tool called "android" replaces the activitycreator script.</li>
+  </ul>
+
+<p>For details about the Android platforms included in the SDK &mdash; including
+bug fixes, features, and API changes &mdash; please read the Version Notes
+documents available at left. For a list of Android platforms included in this
+release, see the <a href="{@docRoot}sdk/1.5_r1/index.html">Download
+page</a>.</p>
+
+<h3>Installation and Upgrade Notes</h3>
+
+<p>If you've been developing an application using an Android 1.1 SDK, you need
+to make a few changes to your development environment to migrate to the new SDK.
+Tools and documentation are provided to assist you. No changes to the source
+code of an existing application should be needed, provided that your application
+is not using Android internal structures or APIs.</p>
+
+<p>To ensure that your existing application will work properly on a device
+running the latest version of the Android platform, you are strongly encouraged
+to migrate the application to the new SDK, compile it using the platform
+matching the application's original API Level, and run it against the most
+current platform. </p>
+
+<p>If you're installing the Android SDK for the first time, please see
+the instructions in <a
+href="{@docRoot}sdk/1.5_r1/installing.html">Installing the SDK</a>.
+
+<h3>SDK Add-Ons</h3>
+
+<p>This version of the SDK introduces support for SDK add-ons, which extend the
+Android SDK to give you access to one or more external Android libraries and/or
+a customized (but compliant) system image that can run in the emulator. The
+purpose of an SDK add-on is to give you a way to develop applications for a
+specific actual device (or family of devices) that extends the APIs available to
+Android applications through external libraries or system customizations. </p>
+
+<p>From the perspective of your Android development environment, an SDK add-on
+is similar to any of the Android platform targets included in the SDK &mdash; it
+includes an external library, a system image, as well as custom emulator skins
+and system properties. The add-on differs in that the Android platform it
+provides may include customized UI, resources, or behaviors, a different set of
+preinstalled applications, or other similar modifications. 
+
+<p>The SDK includes a single SDK add-on &mdash; the Google APIs add-on. The
+Google APIs add-on gives your application access to the com.google.android.maps
+external library that is included on many (if not most) Android-powered devices. 
+The Google APIs add-on also includes a {@link android.location.Geocoder Geocoder}
+backend service implementation. For more information, see the "Maps External 
+Library" section below. </p>
+
+<h3>Android Virtual Devices (AVDs)</h3>
+
+<p>The SDK now gives you the capability to compile an application against any
+one of several system targets, then run it in the emulator on top of any
+compatible system image. There are two types of targets:</p>
+<ul>
+<li>Targets that represent core Android platform versions. </li>
+<li>Targets that are SDK add-ons, which typically provide application access to
+one or more external libraries and/or a customized (but compliant) system image
+that can run in the emulator. 
+</ul>
+
+<p>A new tool called "android" lets you discover what targets and AVDs are
+available to use.</p>
+
+<p>For more information about AVDs, see <a
+href="{@docRoot}guide/developing/tools/avd.html">Android Virtual Devices</a>
+
+<h3>Other Notes</h3>
+
+<p><strong>Maps External Library</strong></p>
+
+<p>In previous versions of the SDK, the com.google.android.maps package was
+included in the standard Android library and system image. In the Android 1.5
+SDK, that is not the case. The Android 1.5 library and system image do not
+include the Maps external library (com.google.android.maps). However, the Maps
+external library is available as part of the Google APIs add-on for the Android
+SDK, downloadable from this location: </p>
+
+<p style="margin-left:2em;"><a
+href="http://code.google.com/android/add-ons/google-apis">http://code.google.com
+/android/add-ons/google-apis</a> </p>
+
+<p>For your convenience, the Google APIs add-on is included in the SDK. </p>
+
+<p>For information about how to register for a Maps API Key, see 
+<a href="http://code.google.com/android/add-ons/google-apis/mapkey.html">
+Obtaining a Maps API Key</a>.</p>
+
+<p><strong>USB Drivers for Windows</strong></p>
+
+<p>If you are using Windows and want to develop or test your application on an
+Android-powered device (such as the T-Mobile G1), you need an appropriate USB
+driver. For your convenience, the Windows version of the Android SDK includes
+these USB drivers that you can install, to let you develop on the device:</p>
+
+<ul>
+<li>USB driver for 32-bit XP and Vista</li>
+<li>USB driver for 64-bit Vista only</li>
+</ul>
+
+<p>The USB driver files are located in the
+<code>&lt;SDK&gt;/usb_driver</code> directory. For details and
+installation instructions, see <a
+href="{@docRoot}guide/developing/device.html#setting-up">Setting Up a
+Device for Development</a>.</p>
+</p>
+
+<h3>Resolved Issues, Changes</h3>
+
+<p><strong>Media</strong></p>
+<ul>
+<li>Updated documentation for {@link android.media.SoundPool
+android.media.SoundPool}</li>
+<li>{@link android.webkit.WebView} objects no longer automatically save
+thumbnails. The {@link android.webkit.WebView#capturePicture() capturePicture()}
+method will need to be called manually.</li>
+</ul>
+
+<h3>Known Issues</h3>
+
+<p><strong>Sensor problems in Emulator</strong></p>
+
+<ul>
+<li>If your application uses the Sensor API and you are running it in the
+emulator on the Android 1.5 system image, you may experience problems. Your
+application may generate ANR messages or crash when using the sensors. The
+problem is being investigated.</li>
+</ul>
+
+<p><strong>Other</strong></p>
+
+<ul>
+<li>We regret to inform developers that Android 1.5 will not include support for
+the Zilog Z80 processor architecture.</li>
+</ul>
+
 
 <h2 id="1.1_r1">Android 1.1 SDK, Release 1</h2>
 
-<p>This SDK provides the development tools and Android system image you need to create applications for Android-powered devices. Applications developed on this SDK will be compatible with mobile devices running the Android 1.1 platform. </p>
+<p>This SDK provides the development tools and Android system image you need to
+create applications for Android-powered devices. Applications developed on this
+SDK will be compatible with mobile devices running the Android 1.1 platform.
+</p>
 
-<p>This release provides an updated system image (Android 1.1), updated documentation, and the same set of development tools provided in the Android 1.0 r2 SDK. The updated system image includes bug fixes and some smaller features, as well as a few minor API changes from the 1.0 version. </p>
+<p>This release provides an updated system image (Android 1.1), updated
+documentation, and the same set of development tools provided in the Android 1.0
+r2 SDK. The updated system image includes bug fixes and some smaller features,
+as well as a few minor API changes from the 1.0 version. </p>
 
-<p>For details about the Android 1.1 system image included in the SDK &mdash; including bug fixes, features, and API changes &mdash; please read the <a href="{@docRoot}sdk/android-1.1.html">Android 1.1 Version Notes</a>.</p>
+<p>For details about the Android 1.1 system image included in the SDK &mdash;
+including bug fixes, features, and API changes &mdash; please read the <a
+href="{@docRoot}sdk/android-1.1.html">Android 1.1 Version Notes</a>.</p>
 
 <h3>App Versioning for Android 1.1</h3>
 
-<p>If you are using this SDK to build an application that is compatible <em>only</em> with Android-powered devices running the Android 1.1 platform, please note that you <strong>must</strong> set the the <code>android:minSdkVersion</code> attribute in the application's manifest to the API Level of Android 1.1 &mdash; "2".</p>
+<p>If you are using this SDK to build an application that is compatible
+<em>only</em> with Android-powered devices running the Android 1.1 platform,
+please note that you <strong>must</strong> set the the
+<code>android:minSdkVersion</code> attribute in the application's manifest to
+the API Level of Android 1.1 &mdash; "2".</p>
 
-<p>Specifically, you specify the <code>android:minSdkVersion</code> attribute in a <code>&lt;uses-sdk&gt;</code> element as a child of <code>&lt;manifest&gt;</code> in the manifest file. When set, the attribute looks like this: </p>
+<p>Specifically, you specify the <code>android:minSdkVersion</code> attribute in
+a <code>&lt;uses-sdk&gt;</code> element as a child of
+<code>&lt;manifest&gt;</code> in the manifest file. When set, the attribute
+looks like this: </p>
 
 <pre><code>&lt;manifest&gt;
   ...
@@ -24,13 +212,29 @@ page.title=SDK Release Notes
 &lt;/manifest&gt;</code>
 </pre>
 
-<p>By setting <code>android:minSdkVersion</code> in this way, you ensure that users will only be able to install your application if their devices are running the Android 1.1 platform. In turn, this ensures that your application will function properly on their devices, especially if it uses APIs introduced in Android 1.1. </p>
+<p>By setting <code>android:minSdkVersion</code> in this way, you ensure that
+users will only be able to install your application if their devices are running
+the Android 1.1 platform. In turn, this ensures that your application will
+function properly on their devices, especially if it uses APIs introduced in
+Android 1.1. </p>
 
-<p>If your application uses APIs introduced in Android 1.1 but does not declare <code>&lt;uses-sdk minSdkVersion="2" /&gt;</code>, then it will run properly on Android 1.1 devices but <em>not</em> on Android 1.0 devices. </p>
+<p>If your application uses APIs introduced in Android 1.1 but does not declare
+<code>&lt;uses-sdk minSdkVersion="2" /&gt;</code>, then it will run properly on
+Android 1.1 devices but <em>not</em> on Android 1.0 devices. </p>
 
-<p>If your application does not use any new APIs introduced in Android 1.1, you can indicate Android 1.0 compatibility by removing <code>minSdkVersion</code> or setting the attribute to "1". However, before publishing your application, you must make sure to compile your application against the Android 1.0 system image (available in the Android 1.0 SDK), to ensure that it builds and functions properly for Android 1.0 devices. You should test the application against system images corresponding to the API Levels that the application is designed to be compatible with.</p>
+<p>If your application does not use any new APIs introduced in Android 1.1, you
+can indicate Android 1.0 compatibility by removing <code>minSdkVersion</code> or
+setting the attribute to "1". However, before publishing your application, you
+must make sure to compile your application against the Android 1.0 system image
+(available in the Android 1.0 SDK), to ensure that it builds and functions
+properly for Android 1.0 devices. You should test the application against system
+images corresponding to the API Levels that the application is designed to be
+compatible with.</p>
 
-<p>If you are sure your application is not using Android 1.1 APIs and has no need to use them, you might find it easier to keep working in the Android 1.0 SDK, rather than migrating to the Android 1.1 SDK and having to do additional testing.</p>
+<p>If you are sure your application is not using Android 1.1 APIs and has no
+need to use them, you might find it easier to keep working in the Android 1.0
+SDK, rather than migrating to the Android 1.1 SDK and having to do additional
+testing.</p>
 
 
 <h3>ADT Plugin Compatibility</h3>
@@ -52,7 +256,7 @@ application on the Android 1.1 emulator for the first time.</p>
 
 <p>If you're installing the Android SDK for the first time, please see
 the instructions in <a
-href="{@docRoot}sdk/1.1_r1/installing.html">Installing the SDK</a>.
+href="{@docRoot}sdk/1.5_r1/installing.html">Installing the SDK</a>.
 
 <h3>Other Notes</h3>
 
@@ -136,9 +340,6 @@ are not working in this release.</li>
 </ul>
 
 
-
-
-
 <h2 id="1.0_r2">Android 1.0 SDK, Release 2</h2>
 
 <p>This SDK release includes the Android 1.0 platform and application API.
diff --git a/docs/html/sdk/adt_download.jd b/docs/html/sdk/adt_download.jd
index 6e9eec4a2b73..6d46297830e8 100644
--- a/docs/html/sdk/adt_download.jd
+++ b/docs/html/sdk/adt_download.jd
@@ -26,11 +26,18 @@ page</a>.
   </tr>
 
   <tr>
-     <td style="background-color:#ffcccc;">0.8.0</td>
-     <td style="background-color:#ffcccc;"><a href="http://dl-ssl.google.com/android/ADT-0.8.0.zip">ADT-0.8.0.zip</a></td>
-     <td style="background-color:#ffcccc;">23&nbsp;September&nbsp;2008</td>
-     <td style="background-color:#ffcccc;">Android&nbsp;1.1&nbsp;SDK,&nbsp;Release&nbsp;1<br />Android&nbsp;1.0&nbsp;SDK,&nbsp;Release&nbsp;1<br /></td>
-     <td style="background-color:#ffcccc;">Required for users of Android 1.1 SDK, Release&nbsp;1 and Android&nbsp;1.0&nbsp;SDK,&nbsp;Release&nbsp;1<br /> </td>
+     <td style="background-color:#ffcccc;">0.9.0</td>
+     <td style="background-color:#ffcccc;"><a href="http://dl-ssl.google.com/android/ADT-0.9.0.zip">ADT-0.9.0.zip</a></td>
+     <td style="background-color:#ffcccc;"><nobr>27 April 2009</nobr></td>
+     <td style="background-color:#ffcccc;"><nobr>Android 1.5 SDK</td>
+     <td style="background-color:#ffcccc;"><nobr>Required for users of Android 1.5 SDK (and later releases)<br /> </td>
+  </tr>
+  <tr>
+     <td>0.8.0</td>
+     <td><a href="http://dl-ssl.google.com/android/ADT-0.8.0.zip">ADT-0.8.0.zip</a></td>
+     <td style="background-color:#ffcccc;"><nobr>23 September 2008</nobr></td>
+     <td style="background-color:#ffcccc;"><nobr>Android 1.1 SDK<br/>Android 1.0 SDK<br/></td>
+     <td style="background-color:#ffcccc;"><nobr>Required for users of Android 1.1 SDK and Android 1.0 SDK<br /> </td>
   </tr>
   <tr>
      <td>0.7.1</td>
diff --git a/docs/html/sdk/android-1.1.jd b/docs/html/sdk/android-1.1.jd
index f70ad262a514..ce75e60fdee6 100644
--- a/docs/html/sdk/android-1.1.jd
+++ b/docs/html/sdk/android-1.1.jd
@@ -32,24 +32,21 @@ API. As with the Android 1.0 API, the Android 1.1 API
 is assigned an integer identifier &mdash; <strong>2</strong> &mdash; that is
 stored in the system itself. This identifier, called the "API Level", allows the
 system to correctly determine whether an application is compatible with
-the system, prior to installing the application.</p>
+the system, prior to installing the application. </p>
 
-<p>Applications can reference a specific API Level value in their
-manifest files, to indicate the minimum version of the Android system
-required to run the app. To reference a minimum API Level, applications 
-can add a <code>minSdkVersion</code> attribute in their manifest files.
+<p>Applications indicate the lowest system API Level that they are compatible with by adding
+a value to the <code>minSdkVersion</code> attribute.
 The value of the attribute is an integer corresponding to an API Level 
-identifier. Prior to installing an application, the system then checks the value of 
+identifier. Prior to installing an application, the system checks the value of 
 <code>minSdkVersion</code> and allows the install only
 if the referenced integer is less than or equal to the API Level integer stored
 in the system itself. </p>
 
 <p>If you use the Android 1.1 system image to build an application
 compatible with Android-powered devices running the Android 1.1
-platform, please note that you <strong><span
-style="color:red;">must</span></strong> set the the
-<code>android:minSdkVersion</code> attribute in the application's
-manifest to "2", which is the API strictly associated with Android 1.1.
+platform, you <strong style="color:red">must</strong> set the
+<code>minSdkVersion</code> attribute to "2" in order to specify that your application
+is compatible only with devices using the Android 1.1 (or greater) system image.
 </p>
 
 <p>Specifically, you specify the <code>android:minSdkVersion</code>
@@ -59,7 +56,7 @@ attribute looks like this: </p>
 
 <pre><code>&lt;manifest&gt;
   ...
-  &lt;uses-sdk minSdkVersion="2" /&gt;
+  &lt;uses-sdk android:minSdkVersion="2" /&gt;
   ...
 &lt;/manifest&gt;</code>
 </pre>
diff --git a/docs/html/sdk/android-1.5-highlights.jd b/docs/html/sdk/android-1.5-highlights.jd
new file mode 100644
index 000000000000..46022d159d22
--- /dev/null
+++ b/docs/html/sdk/android-1.5-highlights.jd
@@ -0,0 +1,205 @@
+page.title=Android 1.5 Platform Highlights
+sdk.version=1.5_r1
+@jd:body
+
+<p>
+<em>April 2009</em>
+</p>
+
+
+<p>The Android 1.5 platform introduces many new features for users and developers. 
+The list below provides an overview of the changes. </p>
+
+<ul>
+<li><a href="#ui">UI Localizations</a>
+<li><a href="#perf">Resolved Issues</a>
+<li><a href="#features">Android 1.5 Platform Highlights</a>
+<li><a href="#apis">New APIs and manifest elements</a>
+</ul>
+
+<h2 id="ui">User interface refinements</h4>
+<ul>
+    <li>System-wide:
+      <ul>
+        <li>Refinement of all core UI elements</li>
+        <li>Animated window transitions (off by default)</li>
+        <li>Accelerometer-based application rotations</li>
+      </ul>
+   </li>
+    <li>UI polish for:
+      <ul>
+        <li>In-call experience</li>
+        <li>Contacts, Call log, and Favorites</li>
+        <li>SMS &amp; MMS</li>
+        <li>Browser</li>
+        <li>Gmail</li>
+        <li>Calendar</li>
+        <li>Email</li>
+        <li>Camera &amp; Gallery</li>
+        <li>Application management</li>
+      </ul>
+   </li>
+</ul>
+
+<h2 id="perf">Performance improvements</h2>
+
+<ul>
+<li>Faster Camera start-up and image capture</li>
+<li>Much faster acquisition of GPS location (powered by SUPL AGPS)</li>
+<li>Smoother page scrolling in Browser</li>
+<li>Speedier GMail conversation list scrolling</li>
+</ul>
+
+<h4 id="features">New features</h4>
+
+<ul>
+  <li>On-screen soft keyboard
+  <ul>
+    <li>Works in both portrait and landscape orientation</li>
+    <li>Support for user installation of 3rd party keyboards</li>
+    <li>User dictionary for custom words</li>
+  </ul>
+</li>
+
+<li>Home screen
+  <ul>
+     <li>Widgets
+     <ul>
+       <li>Bundled home screen widgets include: analog clock, calendar, 
+           music player, picture frame, and search</li>
+     </ul></li>
+     <li>Live folders</li>
+  </ul>
+</li>
+
+<li>Camera &amp; Gallery
+  <ul>
+  <li>Video recording</li>
+  <li>Video playback (MPEG-4 &amp; 3GP formats)</li>
+  </ul>
+</li>
+
+<li>Bluetooth&nbsp;
+  <ul>
+    <li>Stereo Bluetooth support (A2DP and AVCRP profiles)</li>
+    <li>Auto-pairing</li>
+    <li>Improved handsfree experience</li>
+  </ul>
+</li>
+
+<li>Browser
+  <ul>
+    <li>Updated with latest Webkit browser &amp; Squirrelfish Javascript engines</li>
+    <li>Copy 'n paste in browser</li>
+    <li>Search within a page</li>
+    <li>User-selectable text-encoding</li>
+    <li>UI changes include:
+      <ul>
+        <li>Unified Go and Search box</li>
+        <li>Tabbed bookmarks/history/most-visited screen</li>
+      </ul>
+    </li>
+  </ul>
+</li>
+
+<li>Contacts
+  <ul>
+    <li>Shows user picture for Favorites</li>
+    <li>Specific date/time stamp for events in call log</li>
+    <li>One-touch access to a contact card from call log event</li>
+  </ul>
+</li>
+
+<li>System
+<ul>
+  <li>New Linux kernel (version 2.6.27)</li>
+  <li>SD card filesystem auto-checking and repair</li>
+  <li>SIM Application Toolkit 1.0 </li>
+</ul>
+</li>
+
+<li>Google applications (not available in the Android 1.5 System Image that is
+included in the Android SDK)
+  <ul>
+    <li>View Google Talk friends' status in Contacts, SMS, MMS, GMail, and 
+        Email applications</li>
+    <li>Batch actions such as archive, delete, and label on Gmail messages</li>
+    <li>Upload videos to Youtube</li>
+    <li>Upload photos on Picasa</li>
+  </ul>
+</li>
+</ul>
+
+<h4 id="apis">New APIs and manifest elements</h4>
+
+<ul>
+<li>UI framework
+  <ul>
+    <li>Framework for easier background/UI thread interaction</li>
+    <li>New {@link android.widget.SlidingDrawer SlidingDrawer} widget</li>
+    <li>New {@link android.widget.HorizontalScrollView HorizontalScrollview} widget</li>
+  </ul>
+</li>
+
+<li>AppWidget framework
+  <ul>
+    <li>APIs for creating secure home screen {@link android.appwidget app
+        widgets}. Also see the <a href="http://android-developers.blogspot.com/2009/04/introducing-home-screen-widgets-and.html">Introducing home screen widgets and the AppWidget
+        framework.</li>
+    <li>APIs for populating {@link android.provider.LiveFolders Live Folders}
+with custom content.</li>
+  </ul>
+</li>
+
+<li>Media framework
+  <ul>
+    <li>Raw audio recording and playback APIs</li>
+    <li>Interactive MIDI playback engine</li>
+    <li>{@link android.media.MediaRecorder Video Recording APIs} for developers (3GP format).</li>
+    <li>Video and photo sharing Intents</li>
+    <li>Media search Intent</li>
+  </ul>
+</li>
+
+<li>Input Method framework 
+   <ul>
+    <li>{@link android.inputmethodservice.InputMethodService Input Method
+        Service} framework</li>
+    <li>Text-prediction engine</li>
+    <li>Ability to provide downloadable IMEs to users</li>
+  </ul>
+</li>
+
+<li>Application-defined hardware requirements
+   <p>Applications can now use a new element in their manifest files, <a
+href="{@docRoot}guide/topics/manifest/uses-configuration-element.html">&lt;uses-
+configuration&gt;</a> to indicate to the Android system what hardware features
+they require in order to function properly. For example, an application might
+use the element to specify that it requires a physical keyboard or a particular
+navigation device, such as a trackball. Prior to installing the application, the
+Android system checks the attributes defined for the
+<code>&lt;uses-configuration&gt;</code> element and allows the installation to
+continue only if the required hardware is present.</p>
+</li>
+
+<li>Speech recognition framework
+    <ul>
+    <li>Support for using speech recognition libraries via Intent. See {@link
+android.speech.RecognizerIntent Speech Recognition}.</li>
+  </ul>
+</li>
+
+<li>Misc API additions
+  <ul>
+    <li>LocationManager - Applications can get location change updates via
+        Intent</li>
+    <li>WebView - Touch start/end/move/cancel DOM event support</li>
+    <li>Redesigned {@link android.hardware.SensorManager Sensor Manager
+        APIs}</li>
+    <li>GLSurfaceView - convenience framework for creating OpenGL
+        applications</li>
+    <li>Broadcast Intent for app update install succeeded - for smoother app
+        upgrade experience</li>
+  </ul>
+</li>
+</ul>
diff --git a/docs/html/sdk/android-1.5.jd b/docs/html/sdk/android-1.5.jd
index fff911e29096..c9ab42e01e9e 100644
--- a/docs/html/sdk/android-1.5.jd
+++ b/docs/html/sdk/android-1.5.jd
@@ -8,7 +8,250 @@ sys.date=April 2009
 <em>API Level:</em>&nbsp;<strong>3</strong></p>
 
 
-<p>Please see <a href="{@docRoot}sdk/preview/index.html">Download the Android 1.5 Early Look SDK</a> for more information. </p>
+<p>This document provides version notes for the Android 1.5 system image included in the SDK. </p>
+
+<ul>
+<li><a href="#overview">Overview</a>
+<li><a href="#overview">External Libraries</a>
+<li><a href="#comp">Device Compatibility</a>
+<li><a href="#apps">Built-in Applications</a>
+<li><a href="#locs">UI Localizations</a>
+<!-- <li><a href="#resolved-issues">Resolved Issues</a> -->
+<li><a href="#features">Android 1.5 Platform Highlights</a>
+<li><a href="#api-changes">API Changes</a>
+</ul>
+
+<h2 id="overview">Overview</h2>
+
+<p>The Android 1.5 system delivered in the SDK (as library and system image) is
+the development counterpart to the Android 1.5 production system image,
+deployable to Android-powered handsets starting in May 2009. The system is fully
+compliant and includes no external libraries. This is the first version of the 
+Android SDK that does not include the Maps external library.</p>
+
+<p>The Android 1.5 system delivers an updated version of the framework
+API. As with previous versions, the Android 1.5 API 
+is assigned an integer identifier &mdash; <strong>3</strong> &mdash; that is
+stored in the system itself. This identifier, called the "API Level", allows the
+system to correctly determine whether an application is compatible with
+the system, prior to installing the application.</p>
+
+<p>Applications can reference a specific API Level value in their
+manifest files, to indicate the minimum version of the Android system
+required to run the application. To reference a minimum API Level, applications 
+can add a <code>minSdkVersion</code> attribute in their manifest files.
+The value of the attribute is an integer corresponding to an API Level 
+identifier. Prior to installing an application, the system then checks the value of 
+<code>minSdkVersion</code> and allows the install only
+if the referenced integer is less than or equal to the API Level integer stored
+in the system itself. </p>
+
+<p>When you migrate your application to the new SDK, you will need to choose
+the platform version against which you will compile your application. In
+general, you should compile your application against the lowest possible
+version of the platform that your application can support. After you determine 
+the lowest version, you should ensure that your application's manifest file 
+defines the API Level of the lowest compatible platform version in the 
+<code>minSdkVersion</code> attribute.
+
+<p>After compiling your application, you should make sure to test it on the
+platform specified in the application's <code>minSdkVersion</code> attribute. To
+ensure forward-compatibility, you should also run the application on platforms
+using a higher API Level than that used by your application. To run your
+application against different platform versions in the emulator, you create an
+AVD for each platform version that you want to test. For more information about
+AVDs, see <a href="{@docRoot}guide/developing/tools/avd.html">Android Virtual
+Devices</a>. If you are using a physical device for testing, ensure that you
+know the API Level of the Android platform it runs.</p>
+
+<p>If you build an application using the Android 1.5 library and your
+application makes use of any APIs introduced in API Level 3, you <strong><span
+style="color:red;">must</span></strong> set the
+<code>android:minSdkVersion</code> attribute in the application's manifest to
+"3". </p>
+
+<p>Specifically, you define the <code>android:minSdkVersion</code>
+attribute in a <code>&lt;uses-sdk&gt;</code> element as a child of
+<code>&lt;manifest&gt;</code> in the manifest file. When set, the
+attribute looks like this: </p>
+
+<pre>&lt;manifest&gt;
+  ...
+  &lt;uses-sdk minSdkVersion="3" /&gt;
+  ...
+&lt;/manifest&gt;</pre>
+
+<p>By setting <code>android:minSdkVersion</code> in this way, you ensure that
+users will only be able to install your application if their devices are running
+a compatible version of the Android platform. In turn, this ensures that your
+application will function properly on their devices. This is especially
+important if your application uses <a href="#apichange">APIs or system features
+introduced in Android 1.5</a>. </p>
+
+<p>If your application uses APIs introduced in Android 1.5 but does not
+declare <code>&lt;uses-sdk minSdkVersion="3" /&gt;</code>, then it will
+run properly on Android 1.5 devices but <em>not</em> on Android 1.0
+devices. In the latter case, the application will crash at runtime when
+it tries to use the Android 1.5 APIs.</p>
+
+<p>Conversely, if your application does not use any new APIs introduced in 
+Android 1.5, the application will in most cases function normally on devices 
+running a later version of the  platform.  However, if you have published 
+the application, you are strongly encouraged to install and test your 
+application on the Android 1.5 system image included in the SDK. This will 
+ensure a smooth transition for users, as they upgrade their devices to 
+the new version of the Android platform. </p>
+
+<p>Finally, if your application does not use any new APIs introduced since 
+Android 1.1, you can indicate general Android 1.1 compatibility by 
+setting the attribute to "2". If your application does not use any
+new APIs introduced since Android 1.0, you can remove the attribute or 
+set it to "1". However,
+before publishing your application, you must make sure to compile your
+application against the Android library that corresponds to the application's
+<code>minSdkVeresion</code> value.</p>
+
+<h2 id="apps">Built-in Applications</h2>
+
+<p>The system image includes these built-in applications:</p>
+	<ul>
+	<li>Alarm Clock</li>
+	<li>Browser</li>
+	<li>Calculator</li>
+	<li>Camcorder</li>
+	<li>Camera</li>
+	<li>Contacts</li>
+	<li>Custom Locale (developer app)</li>
+	<li>Dev Tools (developer app)</li>
+	<li>Dialer</li>
+	<li>Email</li>
+	<li>Gallery</li>
+	<li>Messaging</li>
+	<li>Music</li>
+	<li>Settings</li>
+	<li>Spare Parts (developer app)</li>
+	</ul>
+
+<h2 id="locs">Locales</h2>
+
+<p>The system image provides a variety of built-in locales. In some cases, 
+region-specific strings are available for the locales. In other cases, 
+a default version of the language is used. The languages that will be 
+available in the Android 1.5 system image are listed below (with 
+<em>language</em>_<em>country/region</em> locale descriptor).</p>
+
+<div class="g-unit g-first" style="whitespace:nowrap;width:35%;">
+<ul>
+<li>Chinese, PRC (zh_CN)</li>
+<li>Chinese, Taiwan (zh_TW)</li>
+<li>Czech (cs_CZ)</li>
+<li>Dutch, Netherlands (nl_NL)</li>
+<li>Dutch, Belgium (nl_BE)</li>
+<li>English, US (en_US)</li>
+<li>English, Britain (en_GB)</li>
+<li>English, Canada(en_CA)</li>
+<li>English, Australia (en_AU)</li>
+<li>English, New Zealand (en_NZ)</li>
+<li>English, Singapore(en_SG)</li>
+<li>French, France (fr_FR)</li>
+</div>
+<div class="g-unit" style="whitespace:nowrap;">
+<li>French, Belgium (fr_BE)</li>
+<li>French, Canada (fr_CA)</li>
+<li>French, Switzerland (fr_CH)</li>
+<li>German, Germany (de_DE)</li>
+<li>German, Austria(de_AT)</li>
+<li>German, Switzerland (de_CH)</li>
+<li>German, Liechtenstein (de_LI)</li>
+<li>Italian, Italy (it_IT)</li>
+<li>Italian, Switzerland (it_CH)</li>
+<li>Japanese (ja_JP)</li>
+<li>Korean (ko_KR)</li>
+<li>Polish (pl_PL)</li>
+<li>Russian (ru_RU)</li>
+<li>Spanish (es_ES)</li>
+</ul> 
+</div>
+
+<p>Localized UI strings match the locales that are displayable in 
+the emulator, accessible through the device Settings application.</p>
+
+<!-- 
+<h2 id="resolved-issues">Resolved Issues</h2>
+<ul>
+<li><font color="red"><strong></strong></font></li>
+</ul>
+-->
+
+<h2 id="features">New Features</h2>
+
+<p>For a list of new system features, see the <a
+href="{@docRoot}sdk/android-1.5-highlights.html">Android 1.5 Platform
+Highlights</a> document.</p>
+
+<h2 id="api-changes">API Changes</h2>
+
+<h3>Overview</strong></h3>
+
+<ul>
+  <li>UI framework</li>
+  <ul>
+    <li>Framework for easier background/UI thread interaction</li>
+    <li>New SlidingDrawer widget</li>
+    <li>Horizontal ScrollView widget</li>
+  </ul>
+
+  <li>Home Screen framework</li>
+  <ul>
+    <li>APIs for creating secure home screen widgets</li>
+    <li>APIs for populating live folders with custom content</li>
+  </ul>
+
+  <li>Media framework</li>
+  <ul>
+    <li>Raw audio recording and playback APIs</li>
+    <li>Interactive MIDI playback engine</li>
+    <li>Video recording APIs for developers (3GP format)</li>
+    <li>Video and photo sharing Intents</li>
+    <li>Media search Intent</li>
+  </ul>
+  <li>Input Method framework </li>
+   <ul>
+    <li>Text prediction engine</li>
+    <li>Ability to provide downloadable IMEs to users</li>
+  </ul>
+<li>Application-defined hardware requirements
+<p>Applications can now use a new element in their manifest files, <a
+href="{@docRoot}guide/topics/manifest/uses-configuration-element.html">
+&lt;uses-configuration&gt;</a> to indicate to the Android system what hardware 
+features they require in order to function properly. For example, an application
+might use the element to specify that it requires a physical keyboard or a
+particular navigation device, such as a trackball. Prior to installing the
+application, the Android system checks the attributes defined for the
+<code>&lt;uses-configuration&gt;</code> element and allows the installation to
+continue only if the required hardware is present.</p></li>
+  <li>Speech recognition framework</li>
+    <ul>
+    <li>Support for using speech recognition libraries via Intent</li>
+  </ul>
+  <li>Misc API additions</li>
+  <ul>
+    <li> LocationManager - Applications can get location change updates via
+Intent</li>
+    <li>WebView - Touch start/end/move/cancel DOM event support</li>
+    <li>SensorManager - redesigned sensor APIs</li>
+    <li>GLSurfaceView - convenience framework for creating OpenGL
+applications</li>
+    <li>Broadcast Intent for app update install succeeded - for smoother app
+upgrade experience</li>
+  </ul>
+
+</ul>
+
+<h3>API Change Details</h3>
+
+<p>For a detailed view of API changes in this platform (API Level 3), see the <a
+href="{@docRoot}sdk/api_diff/3/changes.html">API Differences Report</a>.</p>
 
 
 
diff --git a/docs/html/sdk/api_diff/3/changes.html b/docs/html/sdk/api_diff/3/changes.html
new file mode 100644
index 000000000000..2ff5de822254
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes.html
@@ -0,0 +1,49 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<!-- on Mon Apr 20 09:15:09 GMT-08:00 2009 -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+API Differences between 2 and 3
+</TITLE>
+<link href="../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+<style type="text/css">
+frame {border:10px solid green;}
+</style
+</HEAD>
+<FRAMESET COLS="242,**" frameborder="1" border="7" xframespacing="20" bordercolor="#e9e9e9"> 
+<frameset rows="164,**" frameborder="1" border="7" xframespacing="20" resizable="yes">
+    <FRAME SRC="changes/jdiff_topleftframe.html" SCROLLING="no" NAME="topleftframe" xframeborder="1" xborder="6" xframespacing="0">
+    <FRAME SRC="changes/alldiffs_index_all.html" SCROLLING="auto" NAME="bottomleftframe" xframeborder="1" xborder="1" xframespacing="0">
+  </FRAMESET>
+  <FRAME SRC="changes/changes-summary.html" SCROLLING="auto" NAME="rightframe" xframeborder="1" xborder="1" xframespacing="0">
+</FRAMESET>
+<NOFRAMES>
+<H2>
+Frame Alert
+</H2>
+
+<P>
+This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client.
+<BR>
+Link to <A HREF="changes/changes-summary.html" target="_top">Non-frame version.</A>
+</NOFRAMES>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/alldiffs_index_additions.html b/docs/html/sdk/api_diff/3/changes/alldiffs_index_additions.html
new file mode 100644
index 000000000000..41f78ab79d97
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/alldiffs_index_additions.html
@@ -0,0 +1,3144 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+All Additions Index
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY class="gc-documentation">
+<a NAME="topheader"></a>
+<table summary="Index for All Differences" width="100%" class="jdiffIndex" border="0" cellspacing="0" cellpadding="0" style="padding-bottom:0;margin-bottom:0;">
+  <tr>
+  <th class="indexHeader">
+    Filter the Index:
+  </th>
+  </tr>
+  <tr>
+  <td class="indexText" style="line-height:1.3em;padding-left:2em;">
+<a href="alldiffs_index_all.html" xclass="hiddenlink">All Differences</a>
+  <br>
+<A HREF="alldiffs_index_removals.html" xclass="hiddenlink">Removals</A>
+  <br>
+<b>Additions</b>
+  <br>
+<A HREF="alldiffs_index_changes.html"xclass="hiddenlink">Changes</A>
+  </td>
+  </tr>
+</table>
+<div id="indexTableCaption">
+<font size="-2"><strong>Bold</strong>&nbsp;indicates&nbsp;New;&nbsp;<strike>Strike</strike>&nbsp;indicates&nbsp;deleted. Plain indicates changed.</font>
+</div>
+<!-- Constructor AbsoluteSizeSpan -->
+<A NAME="A"></A>
+<br><font size="+2">A</font>&nbsp;
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.text.style.AbsoluteSizeSpan.html#android.text.style.AbsoluteSizeSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>AbsoluteSizeSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Field ACCELEROMETER_ROTATION -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.ACCELEROMETER_ROTATION" class="hiddenlink" target="rightframe">ACCELEROMETER_ROTATION</A>
+</nobr><br>
+<!-- Field ACTION_AIRPLANE_MODE_SETTINGS -->
+<nobr><A HREF="android.provider.Settings.html#android.provider.Settings.ACTION_AIRPLANE_MODE_SETTINGS" class="hiddenlink" target="rightframe">ACTION_AIRPLANE_MODE_SETTINGS</A>
+</nobr><br>
+<!-- Field ACTION_APPLICATION_DEVELOPMENT_SETTINGS -->
+<nobr><A HREF="android.provider.Settings.html#android.provider.Settings.ACTION_APPLICATION_DEVELOPMENT_SETTINGS" class="hiddenlink" target="rightframe">ACTION_APPLICATION_DEVELOPMENT_SETTINGS</A>
+</nobr><br>
+<!-- Field ACTION_AUDIO_BECOMING_NOISY -->
+<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.ACTION_AUDIO_BECOMING_NOISY" class="hiddenlink" target="rightframe">ACTION_AUDIO_BECOMING_NOISY</A>
+</nobr><br>
+<!-- Field ACTION_BACKGROUND_DATA_SETTING_CHANGED -->
+<nobr><A HREF="android.net.ConnectivityManager.html#android.net.ConnectivityManager.ACTION_BACKGROUND_DATA_SETTING_CHANGED" class="hiddenlink" target="rightframe">ACTION_BACKGROUND_DATA_SETTING_CHANGED</A>
+</nobr><br>
+<!-- Field ACTION_DATA_ROAMING_SETTINGS -->
+<nobr><A HREF="android.provider.Settings.html#android.provider.Settings.ACTION_DATA_ROAMING_SETTINGS" class="hiddenlink" target="rightframe">ACTION_DATA_ROAMING_SETTINGS</A>
+</nobr><br>
+<!-- Field ACTION_IMAGE_CAPTURE -->
+<nobr><A HREF="android.provider.MediaStore.html#android.provider.MediaStore.ACTION_IMAGE_CAPTURE" class="hiddenlink" target="rightframe">ACTION_IMAGE_CAPTURE</A>
+</nobr><br>
+<!-- Field ACTION_INPUT_METHOD_CHANGED -->
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.ACTION_INPUT_METHOD_CHANGED" class="hiddenlink" target="rightframe">ACTION_INPUT_METHOD_CHANGED</A>
+</nobr><br>
+<!-- Field ACTION_INPUT_METHOD_SETTINGS -->
+<nobr><A HREF="android.provider.Settings.html#android.provider.Settings.ACTION_INPUT_METHOD_SETTINGS" class="hiddenlink" target="rightframe">ACTION_INPUT_METHOD_SETTINGS</A>
+</nobr><br>
+<!-- Field ACTION_INTERNAL_STORAGE_SETTINGS -->
+<nobr><A HREF="android.provider.Settings.html#android.provider.Settings.ACTION_INTERNAL_STORAGE_SETTINGS" class="hiddenlink" target="rightframe">ACTION_INTERNAL_STORAGE_SETTINGS</A>
+</nobr><br>
+<!-- Field ACTION_MANAGE_APPLICATIONS_SETTINGS -->
+<nobr><A HREF="android.provider.Settings.html#android.provider.Settings.ACTION_MANAGE_APPLICATIONS_SETTINGS" class="hiddenlink" target="rightframe">ACTION_MANAGE_APPLICATIONS_SETTINGS</A>
+</nobr><br>
+<!-- Field ACTION_MEDIA_CHECKING -->
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.ACTION_MEDIA_CHECKING" class="hiddenlink" target="rightframe">ACTION_MEDIA_CHECKING</A>
+</nobr><br>
+<!-- Field ACTION_MEDIA_NOFS -->
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.ACTION_MEDIA_NOFS" class="hiddenlink" target="rightframe">ACTION_MEDIA_NOFS</A>
+</nobr><br>
+<!-- Field ACTION_MEMORY_CARD_SETTINGS -->
+<nobr><A HREF="android.provider.Settings.html#android.provider.Settings.ACTION_MEMORY_CARD_SETTINGS" class="hiddenlink" target="rightframe">ACTION_MEMORY_CARD_SETTINGS</A>
+</nobr><br>
+<!-- Field ACTION_NETWORK_OPERATOR_SETTINGS -->
+<nobr><A HREF="android.provider.Settings.html#android.provider.Settings.ACTION_NETWORK_OPERATOR_SETTINGS" class="hiddenlink" target="rightframe">ACTION_NETWORK_OPERATOR_SETTINGS</A>
+</nobr><br>
+<!-- Field ACTION_OUTSIDE -->
+<nobr><A HREF="android.view.MotionEvent.html#android.view.MotionEvent.ACTION_OUTSIDE" class="hiddenlink" target="rightframe">ACTION_OUTSIDE</A>
+</nobr><br>
+<!-- Field ACTION_PACKAGE_DATA_CLEARED -->
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.ACTION_PACKAGE_DATA_CLEARED" class="hiddenlink" target="rightframe">ACTION_PACKAGE_DATA_CLEARED</A>
+</nobr><br>
+<!-- Field ACTION_PACKAGE_REPLACED -->
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.ACTION_PACKAGE_REPLACED" class="hiddenlink" target="rightframe">ACTION_PACKAGE_REPLACED</A>
+</nobr><br>
+<!-- Field ACTION_PHONE_STATE_CHANGED -->
+<nobr><A HREF="android.telephony.TelephonyManager.html#android.telephony.TelephonyManager.ACTION_PHONE_STATE_CHANGED" class="hiddenlink" target="rightframe">ACTION_PHONE_STATE_CHANGED</A>
+</nobr><br>
+<!-- Field ACTION_QUICK_LAUNCH_SETTINGS -->
+<nobr><A HREF="android.provider.Settings.html#android.provider.Settings.ACTION_QUICK_LAUNCH_SETTINGS" class="hiddenlink" target="rightframe">ACTION_QUICK_LAUNCH_SETTINGS</A>
+</nobr><br>
+<!-- Field ACTION_SEARCH_LONG_PRESS -->
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.ACTION_SEARCH_LONG_PRESS" class="hiddenlink" target="rightframe">ACTION_SEARCH_LONG_PRESS</A>
+</nobr><br>
+<!-- Field ACTION_SYNC_SETTINGS -->
+<nobr><A HREF="android.provider.Settings.html#android.provider.Settings.ACTION_SYNC_SETTINGS" class="hiddenlink" target="rightframe">ACTION_SYNC_SETTINGS</A>
+</nobr><br>
+<!-- Field ACTION_SYSTEM_TUTORIAL -->
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.ACTION_SYSTEM_TUTORIAL" class="hiddenlink" target="rightframe">ACTION_SYSTEM_TUTORIAL</A>
+</nobr><br>
+<!-- Field ACTION_USER_DICTIONARY_SETTINGS -->
+<nobr><A HREF="android.provider.Settings.html#android.provider.Settings.ACTION_USER_DICTIONARY_SETTINGS" class="hiddenlink" target="rightframe">ACTION_USER_DICTIONARY_SETTINGS</A>
+</nobr><br>
+<!-- Field ACTION_USER_PRESENT -->
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.ACTION_USER_PRESENT" class="hiddenlink" target="rightframe">ACTION_USER_PRESENT</A>
+</nobr><br>
+<!-- Field ACTION_VIDEO_CAPTURE -->
+<nobr><A HREF="android.provider.MediaStore.html#android.provider.MediaStore.ACTION_VIDEO_CAPTURE" class="hiddenlink" target="rightframe">ACTION_VIDEO_CAPTURE</A>
+</nobr><br>
+<!-- Field ACTION_WIFI_IP_SETTINGS -->
+<nobr><A HREF="android.provider.Settings.html#android.provider.Settings.ACTION_WIFI_IP_SETTINGS" class="hiddenlink" target="rightframe">ACTION_WIFI_IP_SETTINGS</A>
+</nobr><br>
+<!-- Class ActivityInstrumentationTestCase2 -->
+<A HREF="pkg_android.test.html#ActivityInstrumentationTestCase2" class="hiddenlink" target="rightframe"><b>ActivityInstrumentationTestCase2</b></A><br>
+<!-- Class ActivityManager.RunningAppProcessInfo -->
+<A HREF="pkg_android.app.html#ActivityManager.RunningAppProcessInfo" class="hiddenlink" target="rightframe"><b>ActivityManager.RunningAppProcessInfo</b></A><br>
+<!-- Method addGpsStatusListener -->
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.addGpsStatusListener_added(android.location.GpsStatus.Listener)" class="hiddenlink" target="rightframe"><b>addGpsStatusListener</b>
+(<code>Listener</code>)</A></nobr><br>
+<!-- Method addOnScrollChangedListener -->
+<nobr><A HREF="android.view.ViewTreeObserver.html#android.view.ViewTreeObserver.addOnScrollChangedListener_added(android.view.ViewTreeObserver.OnScrollChangedListener)" class="hiddenlink" target="rightframe"><b>addOnScrollChangedListener</b>
+(<code>OnScrollChangedListener</code>)</A></nobr><br>
+<!-- Method addPropertyChangeListener -->
+<i>addPropertyChangeListener</i><br>
+&nbsp;&nbsp;<nobr><A HREF="java.util.jar.Pack200.Packer.html#java.util.jar.Pack200.Packer.addPropertyChangeListener_added(java.beans.PropertyChangeListener)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>PropertyChangeListener</code>)</b>&nbsp;in&nbsp;java.util.jar.Pack200.Packer
+</A></nobr><br>
+<!-- Method addPropertyChangeListener -->
+&nbsp;&nbsp;<nobr><A HREF="java.util.jar.Pack200.Unpacker.html#java.util.jar.Pack200.Unpacker.addPropertyChangeListener_added(java.beans.PropertyChangeListener)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>PropertyChangeListener</code>)</b>&nbsp;in&nbsp;java.util.jar.Pack200.Unpacker
+</A></nobr><br>
+<!-- Method addPropertyChangeListener -->
+&nbsp;&nbsp;<nobr><A HREF="java.util.logging.LogManager.html#java.util.logging.LogManager.addPropertyChangeListener_added(java.beans.PropertyChangeListener)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>PropertyChangeListener</code>)</b>&nbsp;in&nbsp;java.util.logging.LogManager
+</A></nobr><br>
+<!-- Method addTestProvider -->
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.addTestProvider_added(java.lang.String, boolean, boolean, boolean, boolean, boolean, boolean, boolean, int, int)" class="hiddenlink" target="rightframe"><b>addTestProvider</b>
+(<code>String, boolean, boolean, boolean, boolean, boolean, boolean, boolean, int, int</code>)</A></nobr><br>
+<!-- Field addToDictionary -->
+<nobr><A HREF="android.R.id.html#android.R.id.addToDictionary" class="hiddenlink" target="rightframe">addToDictionary</A>
+</nobr><br>
+<!-- Method adjustMetaAfterKeypress -->
+<nobr><A HREF="android.text.method.MetaKeyKeyListener.html#android.text.method.MetaKeyKeyListener.adjustMetaAfterKeypress_added(long)" class="hiddenlink" target="rightframe"><b>adjustMetaAfterKeypress</b>
+(<code>long</code>)</A></nobr><br>
+<!-- Field ALIGN_BASELINE -->
+<nobr><A HREF="android.text.style.DynamicDrawableSpan.html#android.text.style.DynamicDrawableSpan.ALIGN_BASELINE" class="hiddenlink" target="rightframe">ALIGN_BASELINE</A>
+</nobr><br>
+<!-- Field ALIGN_BOTTOM -->
+<nobr><A HREF="android.text.style.DynamicDrawableSpan.html#android.text.style.DynamicDrawableSpan.ALIGN_BOTTOM" class="hiddenlink" target="rightframe">ALIGN_BOTTOM</A>
+</nobr><br>
+<!-- Constructor AlignmentSpan.Standard -->
+<nobr><A HREF="android.text.style.AlignmentSpan.Standard.html#android.text.style.AlignmentSpan.Standard.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>AlignmentSpan.Standard</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Field allowSingleTap -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.allowSingleTap" class="hiddenlink" target="rightframe">allowSingleTap</A>
+</nobr><br>
+<!-- Class AlphabetIndexer -->
+<A HREF="pkg_android.widget.html#AlphabetIndexer" class="hiddenlink" target="rightframe"><b>AlphabetIndexer</b></A><br>
+<!-- Package android.appwidget -->
+<A HREF="changes-summary.html#android.appwidget" class="hiddenlink" target="rightframe"><b>android.appwidget</b></A><br>
+<!-- Package android.inputmethodservice -->
+<A HREF="changes-summary.html#android.inputmethodservice" class="hiddenlink" target="rightframe"><b>android.inputmethodservice</b></A><br>
+<!-- Package android.speech -->
+<A HREF="changes-summary.html#android.speech" class="hiddenlink" target="rightframe"><b>android.speech</b></A><br>
+<!-- Package android.text.format -->
+<A HREF="changes-summary.html#android.text.format" class="hiddenlink" target="rightframe"><b>android.text.format</b></A><br>
+<!-- Package android.view.inputmethod -->
+<A HREF="changes-summary.html#android.view.inputmethod" class="hiddenlink" target="rightframe"><b>android.view.inputmethod</b></A><br>
+<!-- Field animateOnClick -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.animateOnClick" class="hiddenlink" target="rightframe">animateOnClick</A>
+</nobr><br>
+<!-- Constructor Annotation -->
+<nobr><A HREF="android.text.Annotation.html#android.text.Annotation.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>Annotation</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Method applyDisplay -->
+<nobr><A HREF="android.view.Gravity.html#android.view.Gravity.applyDisplay_added(int, android.graphics.Rect, android.graphics.Rect)" class="hiddenlink" target="rightframe"><b>applyDisplay</b>
+(<code>int, Rect, Rect</code>)</A></nobr><br>
+<!-- Class AssetFileDescriptor.AutoCloseInputStream -->
+<A HREF="pkg_android.content.res.html#AssetFileDescriptor.AutoCloseInputStream" class="hiddenlink" target="rightframe"><b>AssetFileDescriptor.AutoCloseInputStream</b></A><br>
+<!-- Class AssetFileDescriptor.AutoCloseOutputStream -->
+<A HREF="pkg_android.content.res.html#AssetFileDescriptor.AutoCloseOutputStream" class="hiddenlink" target="rightframe"><b>AssetFileDescriptor.AutoCloseOutputStream</b></A><br>
+<!-- Class AsyncTask -->
+<A HREF="pkg_android.os.html#AsyncTask" class="hiddenlink" target="rightframe"><b>AsyncTask</b></A><br>
+<!-- Class AsyncTask.Status -->
+<A HREF="pkg_android.os.html#AsyncTask.Status" class="hiddenlink" target="rightframe"><b>AsyncTask.Status</b></A><br>
+<!-- Class AudioFormat -->
+<A HREF="pkg_android.media.html#AudioFormat" class="hiddenlink" target="rightframe"><b>AudioFormat</b></A><br>
+<!-- Class AudioRecord -->
+<A HREF="pkg_android.media.html#AudioRecord" class="hiddenlink" target="rightframe"><b>AudioRecord</b></A><br>
+<!-- Class AudioRecord.OnRecordPositionUpdateListener -->
+<A HREF="pkg_android.media.html#AudioRecord.OnRecordPositionUpdateListener" class="hiddenlink" target="rightframe"><b><i>AudioRecord.OnRecordPositionUpdateListener</i></b></A><br>
+<!-- Class AudioTrack -->
+<A HREF="pkg_android.media.html#AudioTrack" class="hiddenlink" target="rightframe"><b>AudioTrack</b></A><br>
+<!-- Class AudioTrack.OnPlaybackPositionUpdateListener -->
+<A HREF="pkg_android.media.html#AudioTrack.OnPlaybackPositionUpdateListener" class="hiddenlink" target="rightframe"><b><i>AudioTrack.OnPlaybackPositionUpdateListener</i></b></A><br>
+<!-- Field AXIS_CLIP -->
+<nobr><A HREF="android.view.Gravity.html#android.view.Gravity.AXIS_CLIP" class="hiddenlink" target="rightframe">AXIS_CLIP</A>
+</nobr><br>
+<!-- Field AXIS_MINUS_X -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.AXIS_MINUS_X" class="hiddenlink" target="rightframe">AXIS_MINUS_X</A>
+</nobr><br>
+<!-- Field AXIS_MINUS_Y -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.AXIS_MINUS_Y" class="hiddenlink" target="rightframe">AXIS_MINUS_Y</A>
+</nobr><br>
+<!-- Field AXIS_MINUS_Z -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.AXIS_MINUS_Z" class="hiddenlink" target="rightframe">AXIS_MINUS_Z</A>
+</nobr><br>
+<!-- Field AXIS_X -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.AXIS_X" class="hiddenlink" target="rightframe">AXIS_X</A>
+</nobr><br>
+<!-- Field AXIS_Y -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.AXIS_Y" class="hiddenlink" target="rightframe">AXIS_Y</A>
+</nobr><br>
+<!-- Field AXIS_Z -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.AXIS_Z" class="hiddenlink" target="rightframe">AXIS_Z</A>
+</nobr><br>
+<!-- Constructor BackgroundColorSpan -->
+<A NAME="B"></A>
+<br><font size="+2">B</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.text.style.BackgroundColorSpan.html#android.text.style.BackgroundColorSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>BackgroundColorSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Field backgroundDimEnabled -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.backgroundDimEnabled" class="hiddenlink" target="rightframe">backgroundDimEnabled</A>
+</nobr><br>
+<!-- Method beginBatchEdit -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.beginBatchEdit_added()" class="hiddenlink" target="rightframe"><b>beginBatchEdit</b>
+()</A></nobr><br>
+<!-- Field BIND_APPWIDGET -->
+<nobr><A HREF="android.Manifest.permission.html#android.Manifest.permission.BIND_APPWIDGET" class="hiddenlink" target="rightframe">BIND_APPWIDGET</A>
+</nobr><br>
+<!-- Field BIND_INPUT_METHOD -->
+<nobr><A HREF="android.Manifest.permission.html#android.Manifest.permission.BIND_INPUT_METHOD" class="hiddenlink" target="rightframe">BIND_INPUT_METHOD</A>
+</nobr><br>
+<!-- Field BOOKMARK -->
+<nobr><A HREF="android.provider.MediaStore.Video.VideoColumns.html#android.provider.MediaStore.Video.VideoColumns.BOOKMARK" class="hiddenlink" target="rightframe">BOOKMARK</A>
+</nobr><br>
+<!-- Field bottomOffset -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.bottomOffset" class="hiddenlink" target="rightframe">bottomOffset</A>
+</nobr><br>
+<!-- Method bringPointIntoView -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.bringPointIntoView_added(int)" class="hiddenlink" target="rightframe"><b>bringPointIntoView</b>
+(<code>int</code>)</A></nobr><br>
+<!-- Field BUCKET_DISPLAY_NAME -->
+<nobr><A HREF="android.provider.MediaStore.Video.VideoColumns.html#android.provider.MediaStore.Video.VideoColumns.BUCKET_DISPLAY_NAME" class="hiddenlink" target="rightframe">BUCKET_DISPLAY_NAME</A>
+</nobr><br>
+<!-- Field BUCKET_ID -->
+<nobr><A HREF="android.provider.MediaStore.Video.VideoColumns.html#android.provider.MediaStore.Video.VideoColumns.BUCKET_ID" class="hiddenlink" target="rightframe">BUCKET_ID</A>
+</nobr><br>
+<!-- Constructor BulletSpan -->
+<nobr><A HREF="android.text.style.BulletSpan.html#android.text.style.BulletSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>BulletSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Field BUTTON_NEGATIVE -->
+<nobr><A HREF="android.content.DialogInterface.html#android.content.DialogInterface.BUTTON_NEGATIVE" class="hiddenlink" target="rightframe">BUTTON_NEGATIVE</A>
+</nobr><br>
+<!-- Field BUTTON_NEUTRAL -->
+<nobr><A HREF="android.content.DialogInterface.html#android.content.DialogInterface.BUTTON_NEUTRAL" class="hiddenlink" target="rightframe">BUTTON_NEUTRAL</A>
+</nobr><br>
+<!-- Field BUTTON_POSITIVE -->
+<nobr><A HREF="android.content.DialogInterface.html#android.content.DialogInterface.BUTTON_POSITIVE" class="hiddenlink" target="rightframe">BUTTON_POSITIVE</A>
+</nobr><br>
+<!-- Method calculateLength -->
+<A NAME="C"></A>
+<br><font size="+2">C</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.telephony.gsm.SmsMessage.html#android.telephony.gsm.SmsMessage.calculateLength_added(java.lang.CharSequence, boolean)" class="hiddenlink" target="rightframe"><b>calculateLength</b>
+(<code>CharSequence, boolean</code>)</A></nobr><br>
+<!-- Method callActivityOnUserLeaving -->
+<nobr><A HREF="android.app.Instrumentation.html#android.app.Instrumentation.callActivityOnUserLeaving_added(android.app.Activity)" class="hiddenlink" target="rightframe"><b>callActivityOnUserLeaving</b>
+(<code>Activity</code>)</A></nobr><br>
+<!-- Field candidatesArea -->
+<nobr><A HREF="android.R.id.html#android.R.id.candidatesArea" class="hiddenlink" target="rightframe">candidatesArea</A>
+</nobr><br>
+<!-- Field candidatesTextStyleSpans -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.candidatesTextStyleSpans" class="hiddenlink" target="rightframe">candidatesTextStyleSpans</A>
+</nobr><br>
+<!-- Field CAP_MODE_CHARACTERS -->
+<nobr><A HREF="android.text.TextUtils.html#android.text.TextUtils.CAP_MODE_CHARACTERS" class="hiddenlink" target="rightframe">CAP_MODE_CHARACTERS</A>
+</nobr><br>
+<!-- Field CAP_MODE_SENTENCES -->
+<nobr><A HREF="android.text.TextUtils.html#android.text.TextUtils.CAP_MODE_SENTENCES" class="hiddenlink" target="rightframe">CAP_MODE_SENTENCES</A>
+</nobr><br>
+<!-- Field CAP_MODE_WORDS -->
+<nobr><A HREF="android.text.TextUtils.html#android.text.TextUtils.CAP_MODE_WORDS" class="hiddenlink" target="rightframe">CAP_MODE_WORDS</A>
+</nobr><br>
+<!-- Field CATEGORY_INFO -->
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.CATEGORY_INFO" class="hiddenlink" target="rightframe">CATEGORY_INFO</A>
+</nobr><br>
+<!-- Method changeAction -->
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.changeAction_added(android.view.KeyEvent, int)" class="hiddenlink" target="rightframe"><b>changeAction</b>
+(<code>KeyEvent, int</code>)</A></nobr><br>
+<!-- Method changeCursorAndColumns -->
+<nobr><A HREF="android.widget.SimpleCursorAdapter.html#android.widget.SimpleCursorAdapter.changeCursorAndColumns_added(android.database.Cursor, java.lang.String[], int[])" class="hiddenlink" target="rightframe"><b>changeCursorAndColumns</b>
+(<code>Cursor, String[], int[]</code>)</A></nobr><br>
+<!-- Method changeFlags -->
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.changeFlags_added(android.view.KeyEvent, int)" class="hiddenlink" target="rightframe"><b>changeFlags</b>
+(<code>KeyEvent, int</code>)</A></nobr><br>
+<!-- Method changeTimeRepeat -->
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.changeTimeRepeat_added(android.view.KeyEvent, long, int)" class="hiddenlink" target="rightframe"><b>changeTimeRepeat</b>
+(<code>KeyEvent, long, int</code>)</A></nobr><br>
+<!-- Method checkInputConnectionProxy -->
+<nobr><A HREF="android.view.View.html#android.view.View.checkInputConnectionProxy_added(android.view.View)" class="hiddenlink" target="rightframe"><b>checkInputConnectionProxy</b>
+(<code>View</code>)</A></nobr><br>
+<!-- Class Chronometer.OnChronometerTickListener -->
+<A HREF="pkg_android.widget.html#Chronometer.OnChronometerTickListener" class="hiddenlink" target="rightframe"><b><i>Chronometer.OnChronometerTickListener</i></b></A><br>
+<!-- Method clearComposingText -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.clearComposingText_added()" class="hiddenlink" target="rightframe"><b>clearComposingText</b>
+()</A></nobr><br>
+<!-- Method clearListSelection -->
+<nobr><A HREF="android.widget.AutoCompleteTextView.html#android.widget.AutoCompleteTextView.clearListSelection_added()" class="hiddenlink" target="rightframe"><b>clearListSelection</b>
+()</A></nobr><br>
+<!-- Method clearMatches -->
+<nobr><A HREF="android.webkit.WebView.html#android.webkit.WebView.clearMatches_added()" class="hiddenlink" target="rightframe"><b>clearMatches</b>
+()</A></nobr><br>
+<!-- Method clearMetaKeyState -->
+<i>clearMetaKeyState</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.KeyListener.html#android.text.method.KeyListener.clearMetaKeyState_added(android.view.View, android.text.Editable, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>View, Editable, int</code>)</b>&nbsp;in&nbsp;android.text.method.KeyListener
+</A></nobr><br>
+<!-- Method clearMetaKeyState -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.MetaKeyKeyListener.html#android.text.method.MetaKeyKeyListener.clearMetaKeyState_added(long, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>long, int</code>)</b>&nbsp;in&nbsp;android.text.method.MetaKeyKeyListener
+</A></nobr><br>
+<!-- Method clearMetaKeyState -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.MetaKeyKeyListener.html#android.text.method.MetaKeyKeyListener.clearMetaKeyState_added(android.view.View, android.text.Editable, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>View, Editable, int</code>)</b>&nbsp;in&nbsp;android.text.method.MetaKeyKeyListener
+</A></nobr><br>
+<!-- Method clearMetaKeyState -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.MetaKeyKeyListener.html#android.text.method.MetaKeyKeyListener.clearMetaKeyState_added(android.text.Editable, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Editable, int</code>)</b>&nbsp;in&nbsp;android.text.method.MetaKeyKeyListener
+</A></nobr><br>
+<!-- Method clearTestProviderEnabled -->
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.clearTestProviderEnabled_added(java.lang.String)" class="hiddenlink" target="rightframe"><b>clearTestProviderEnabled</b>
+(<code>String</code>)</A></nobr><br>
+<!-- Method clearTestProviderLocation -->
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.clearTestProviderLocation_added(java.lang.String)" class="hiddenlink" target="rightframe"><b>clearTestProviderLocation</b>
+(<code>String</code>)</A></nobr><br>
+<!-- Method clearTestProviderStatus -->
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.clearTestProviderStatus_added(java.lang.String)" class="hiddenlink" target="rightframe"><b>clearTestProviderStatus</b>
+(<code>String</code>)</A></nobr><br>
+<!-- Field CLIP_HORIZONTAL -->
+<nobr><A HREF="android.view.Gravity.html#android.view.Gravity.CLIP_HORIZONTAL" class="hiddenlink" target="rightframe">CLIP_HORIZONTAL</A>
+</nobr><br>
+<!-- Field CLIP_VERTICAL -->
+<nobr><A HREF="android.view.Gravity.html#android.view.Gravity.CLIP_VERTICAL" class="hiddenlink" target="rightframe">CLIP_VERTICAL</A>
+</nobr><br>
+<!-- Method close -->
+<nobr><A HREF="android.view.Menu.html#android.view.Menu.close_added()" class="hiddenlink" target="rightframe"><b>close</b>
+()</A></nobr><br>
+<!-- Field closeButton -->
+<nobr><A HREF="android.R.id.html#android.R.id.closeButton" class="hiddenlink" target="rightframe">closeButton</A>
+</nobr><br>
+<!-- Method closeContextMenu -->
+<nobr><A HREF="android.app.Activity.html#android.app.Activity.closeContextMenu_added()" class="hiddenlink" target="rightframe"><b>closeContextMenu</b>
+()</A></nobr><br>
+<!-- Field codes -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.codes" class="hiddenlink" target="rightframe">codes</A>
+</nobr><br>
+<!-- Method computeDurationHint -->
+<nobr><A HREF="android.view.animation.Animation.html#android.view.animation.Animation.computeDurationHint_added()" class="hiddenlink" target="rightframe"><b>computeDurationHint</b>
+()</A></nobr><br>
+<!-- Field configPreferences -->
+<nobr><A HREF="android.content.pm.PackageInfo.html#android.content.pm.PackageInfo.configPreferences" class="hiddenlink" target="rightframe">configPreferences</A>
+</nobr><br>
+<!-- Class ConfigurationInfo -->
+<A HREF="pkg_android.content.pm.html#ConfigurationInfo" class="hiddenlink" target="rightframe"><b>ConfigurationInfo</b></A><br>
+<!-- Field configure -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.configure" class="hiddenlink" target="rightframe">configure</A>
+</nobr><br>
+<!-- Field content -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.content" class="hiddenlink" target="rightframe">content</A>
+</nobr><br>
+<!-- Field copy -->
+<nobr><A HREF="android.R.id.html#android.R.id.copy" class="hiddenlink" target="rightframe">copy</A>
+</nobr><br>
+<!-- Method copyPixelsFromBuffer -->
+<nobr><A HREF="android.graphics.Bitmap.html#android.graphics.Bitmap.copyPixelsFromBuffer_added(java.nio.Buffer)" class="hiddenlink" target="rightframe"><b>copyPixelsFromBuffer</b>
+(<code>Buffer</code>)</A></nobr><br>
+<!-- Field copyUrl -->
+<nobr><A HREF="android.R.id.html#android.R.id.copyUrl" class="hiddenlink" target="rightframe">copyUrl</A>
+</nobr><br>
+<!-- Method createInputStream -->
+<nobr><A HREF="android.content.res.AssetFileDescriptor.html#android.content.res.AssetFileDescriptor.createInputStream_added()" class="hiddenlink" target="rightframe"><b>createInputStream</b>
+()</A></nobr><br>
+<!-- Method createOutputStream -->
+<nobr><A HREF="android.content.res.AssetFileDescriptor.html#android.content.res.AssetFileDescriptor.createOutputStream_added()" class="hiddenlink" target="rightframe"><b>createOutputStream</b>
+()</A></nobr><br>
+<!-- Method createWifiLock -->
+<nobr><A HREF="android.net.wifi.WifiManager.html#android.net.wifi.WifiManager.createWifiLock_added(int, java.lang.String)" class="hiddenlink" target="rightframe"><b>createWifiLock</b>
+(<code>int, String</code>)</A></nobr><br>
+<!-- Field CREATOR -->
+<i>CREATOR</i><br>
+&nbsp;in&nbsp;
+<nobr><A HREF="android.content.res.AssetFileDescriptor.html#android.content.res.AssetFileDescriptor.CREATOR" class="hiddenlink" target="rightframe">android.content.res.AssetFileDescriptor</A>
+</nobr><br>
+<!-- Field CREATOR -->
+&nbsp;in&nbsp;
+<nobr><A HREF="android.graphics.RectF.html#android.graphics.RectF.CREATOR" class="hiddenlink" target="rightframe">android.graphics.RectF</A>
+</nobr><br>
+<!-- Field cut -->
+<nobr><A HREF="android.R.id.html#android.R.id.cut" class="hiddenlink" target="rightframe">cut</A>
+</nobr><br>
+<!-- Field dark_header -->
+<A NAME="D"></A>
+<br><font size="+2">D</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.R.drawable.html#android.R.drawable.dark_header" class="hiddenlink" target="rightframe">dark_header</A>
+</nobr><br>
+<!-- Field DEBUG_ENABLE_ASSERT -->
+<nobr><A HREF="dalvik.system.Zygote.html#dalvik.system.Zygote.DEBUG_ENABLE_ASSERT" class="hiddenlink" target="rightframe">DEBUG_ENABLE_ASSERT</A>
+</nobr><br>
+<!-- Field DEBUG_ENABLE_CHECKJNI -->
+<nobr><A HREF="dalvik.system.Zygote.html#dalvik.system.Zygote.DEBUG_ENABLE_CHECKJNI" class="hiddenlink" target="rightframe">DEBUG_ENABLE_CHECKJNI</A>
+</nobr><br>
+<!-- Field DEBUG_ENABLE_DEBUGGER -->
+<nobr><A HREF="dalvik.system.Zygote.html#dalvik.system.Zygote.DEBUG_ENABLE_DEBUGGER" class="hiddenlink" target="rightframe">DEBUG_ENABLE_DEBUGGER</A>
+</nobr><br>
+<!-- Method describeContents -->
+<i>describeContents</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.content.res.AssetFileDescriptor.html#android.content.res.AssetFileDescriptor.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.content.res.AssetFileDescriptor
+</A></nobr><br>
+<!-- Method describeContents -->
+&nbsp;&nbsp;<nobr><A HREF="android.graphics.RectF.html#android.graphics.RectF.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.graphics.RectF
+</A></nobr><br>
+<!-- Method describeContents -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.Annotation.html#android.text.Annotation.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.Annotation
+</A></nobr><br>
+<!-- Method describeContents -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.AbsoluteSizeSpan.html#android.text.style.AbsoluteSizeSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.AbsoluteSizeSpan
+</A></nobr><br>
+<!-- Method describeContents -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.AlignmentSpan.Standard.html#android.text.style.AlignmentSpan.Standard.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.AlignmentSpan.Standard
+</A></nobr><br>
+<!-- Method describeContents -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.BackgroundColorSpan.html#android.text.style.BackgroundColorSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.BackgroundColorSpan
+</A></nobr><br>
+<!-- Method describeContents -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.BulletSpan.html#android.text.style.BulletSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.BulletSpan
+</A></nobr><br>
+<!-- Method describeContents -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.ForegroundColorSpan.html#android.text.style.ForegroundColorSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.ForegroundColorSpan
+</A></nobr><br>
+<!-- Method describeContents -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.LeadingMarginSpan.Standard.html#android.text.style.LeadingMarginSpan.Standard.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.LeadingMarginSpan.Standard
+</A></nobr><br>
+<!-- Method describeContents -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.QuoteSpan.html#android.text.style.QuoteSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.QuoteSpan
+</A></nobr><br>
+<!-- Method describeContents -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.RelativeSizeSpan.html#android.text.style.RelativeSizeSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.RelativeSizeSpan
+</A></nobr><br>
+<!-- Method describeContents -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.ScaleXSpan.html#android.text.style.ScaleXSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.ScaleXSpan
+</A></nobr><br>
+<!-- Method describeContents -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.StrikethroughSpan.html#android.text.style.StrikethroughSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.StrikethroughSpan
+</A></nobr><br>
+<!-- Method describeContents -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.StyleSpan.html#android.text.style.StyleSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.StyleSpan
+</A></nobr><br>
+<!-- Method describeContents -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.SubscriptSpan.html#android.text.style.SubscriptSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.SubscriptSpan
+</A></nobr><br>
+<!-- Method describeContents -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.SuperscriptSpan.html#android.text.style.SuperscriptSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.SuperscriptSpan
+</A></nobr><br>
+<!-- Method describeContents -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.TextAppearanceSpan.html#android.text.style.TextAppearanceSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.TextAppearanceSpan
+</A></nobr><br>
+<!-- Method describeContents -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.TypefaceSpan.html#android.text.style.TypefaceSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.TypefaceSpan
+</A></nobr><br>
+<!-- Method describeContents -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.URLSpan.html#android.text.style.URLSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.URLSpan
+</A></nobr><br>
+<!-- Method describeContents -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.UnderlineSpan.html#android.text.style.UnderlineSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.UnderlineSpan
+</A></nobr><br>
+<!-- Method deviceHasKey -->
+<nobr><A HREF="android.view.KeyCharacterMap.html#android.view.KeyCharacterMap.deviceHasKey_added(int)" class="hiddenlink" target="rightframe"><b>deviceHasKey</b>
+(<code>int</code>)</A></nobr><br>
+<!-- Method deviceHasKeys -->
+<nobr><A HREF="android.view.KeyCharacterMap.html#android.view.KeyCharacterMap.deviceHasKeys_added(int[])" class="hiddenlink" target="rightframe"><b>deviceHasKeys</b>
+(<code>int[]</code>)</A></nobr><br>
+<!-- Class DexClassLoader -->
+<A HREF="pkg_dalvik.system.html#DexClassLoader" class="hiddenlink" target="rightframe"><b>DexClassLoader</b></A><br>
+<!-- Field dialog_alert_title -->
+<nobr><A HREF="android.R.string.html#android.R.string.dialog_alert_title" class="hiddenlink" target="rightframe">dialog_alert_title</A>
+</nobr><br>
+<!-- Method didTouchFocusSelect -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.didTouchFocusSelect_added()" class="hiddenlink" target="rightframe"><b>didTouchFocusSelect</b>
+()</A></nobr><br>
+<!-- Method dispatchKeyEventPreIme -->
+<nobr><A HREF="android.view.View.html#android.view.View.dispatchKeyEventPreIme_added(android.view.KeyEvent)" class="hiddenlink" target="rightframe"><b>dispatchKeyEventPreIme</b>
+(<code>KeyEvent</code>)</A></nobr><br>
+<!-- Field DISPLAY -->
+<nobr><A HREF="android.os.Build.html#android.os.Build.DISPLAY" class="hiddenlink" target="rightframe">DISPLAY</A>
+</nobr><br>
+<!-- Field DISPLAY_CLIP_HORIZONTAL -->
+<nobr><A HREF="android.view.Gravity.html#android.view.Gravity.DISPLAY_CLIP_HORIZONTAL" class="hiddenlink" target="rightframe">DISPLAY_CLIP_HORIZONTAL</A>
+</nobr><br>
+<!-- Field DISPLAY_CLIP_VERTICAL -->
+<nobr><A HREF="android.view.Gravity.html#android.view.Gravity.DISPLAY_CLIP_VERTICAL" class="hiddenlink" target="rightframe">DISPLAY_CLIP_VERTICAL</A>
+</nobr><br>
+<!-- Method drag -->
+<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.drag_added(android.test.InstrumentationTestCase, float, float, float, float, int)" class="hiddenlink" target="rightframe"><b>drag</b>
+(<code>InstrumentationTestCase, float, float, float, float, int</code>)</A></nobr><br>
+<!-- Method dragQuarterScreenDown -->
+<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragQuarterScreenDown_added(android.test.InstrumentationTestCase, android.app.Activity)" class="hiddenlink" target="rightframe"><b>dragQuarterScreenDown</b>
+(<code>InstrumentationTestCase, Activity</code>)</A></nobr><br>
+<!-- Method dragQuarterScreenUp -->
+<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragQuarterScreenUp_added(android.test.InstrumentationTestCase, android.app.Activity)" class="hiddenlink" target="rightframe"><b>dragQuarterScreenUp</b>
+(<code>InstrumentationTestCase, Activity</code>)</A></nobr><br>
+<!-- Method dragViewBy -->
+<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewBy_added(android.test.InstrumentationTestCase, android.view.View, int, int, int)" class="hiddenlink" target="rightframe"><b>dragViewBy</b>
+(<code>InstrumentationTestCase, View, int, int, int</code>)</A></nobr><br>
+<!-- Method dragViewTo -->
+<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewTo_added(android.test.InstrumentationTestCase, android.view.View, int, int, int)" class="hiddenlink" target="rightframe"><b>dragViewTo</b>
+(<code>InstrumentationTestCase, View, int, int, int</code>)</A></nobr><br>
+<!-- Method dragViewToBottom -->
+<i>dragViewToBottom</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewToBottom_added(android.test.ActivityInstrumentationTestCase, android.view.View, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>ActivityInstrumentationTestCase, View, int</code>)</b>&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+<!-- Method dragViewToBottom -->
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewToBottom_added(android.test.InstrumentationTestCase, android.app.Activity, android.view.View, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>InstrumentationTestCase, Activity, View, int</code>)</b>&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+<!-- Method dragViewToTop -->
+<i>dragViewToTop</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewToTop_added(android.test.InstrumentationTestCase, android.view.View)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>InstrumentationTestCase, View</code>)</b>&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+<!-- Method dragViewToTop -->
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewToTop_added(android.test.InstrumentationTestCase, android.view.View, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>InstrumentationTestCase, View, int</code>)</b>&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+<!-- Method dragViewToX -->
+<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewToX_added(android.test.InstrumentationTestCase, android.view.View, int, int)" class="hiddenlink" target="rightframe"><b>dragViewToX</b>
+(<code>InstrumentationTestCase, View, int, int</code>)</A></nobr><br>
+<!-- Method dragViewToY -->
+<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewToY_added(android.test.InstrumentationTestCase, android.view.View, int, int)" class="hiddenlink" target="rightframe"><b>dragViewToY</b>
+(<code>InstrumentationTestCase, View, int, int</code>)</A></nobr><br>
+<!-- Method drawBitmap -->
+<nobr><A HREF="android.graphics.Canvas.html#android.graphics.Canvas.drawBitmap_added(int[], int, int, float, float, int, int, boolean, android.graphics.Paint)" class="hiddenlink" target="rightframe"><b>drawBitmap</b>
+(<code>int[], int, int, float, float, int, int, boolean, Paint</code>)</A></nobr><br>
+<!-- Field dropDownAnchor -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.dropDownAnchor" class="hiddenlink" target="rightframe">dropDownAnchor</A>
+</nobr><br>
+<!-- Field dropDownWidth -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.dropDownWidth" class="hiddenlink" target="rightframe">dropDownWidth</A>
+</nobr><br>
+<!-- Method dump -->
+<i>dump</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.location.Location.html#android.location.Location.dump_added(android.util.Printer, java.lang.String)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Printer, String</code>)</b>&nbsp;in&nbsp;android.location.Location
+</A></nobr><br>
+<!-- Method dump -->
+&nbsp;&nbsp;<nobr><A HREF="android.os.Binder.html#android.os.Binder.dump_added(java.io.FileDescriptor, java.lang.String[])" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>FileDescriptor, String[]</code>)</b>&nbsp;in&nbsp;android.os.Binder
+</A></nobr><br>
+<!-- Method dump -->
+&nbsp;&nbsp;<nobr><A HREF="android.os.IBinder.html#android.os.IBinder.dump_added(java.io.FileDescriptor, java.lang.String[])" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>FileDescriptor, String[]</code>)</b>&nbsp;in&nbsp;android.os.IBinder
+</A></nobr><br>
+<!-- Method dumpCapturedView -->
+<nobr><A HREF="android.view.ViewDebug.html#android.view.ViewDebug.dumpCapturedView_added(java.lang.String, java.lang.Object)" class="hiddenlink" target="rightframe"><b>dumpCapturedView</b>
+(<code>String, Object</code>)</A></nobr><br>
+<!-- Method dumpHprofData -->
+<i>dumpHprofData</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.os.Debug.html#android.os.Debug.dumpHprofData_added(java.lang.String)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>String</code>)</b>&nbsp;in&nbsp;android.os.Debug
+</A></nobr><br>
+<!-- Method dumpHprofData -->
+&nbsp;&nbsp;<nobr><A HREF="dalvik.system.VMDebug.html#dalvik.system.VMDebug.dumpHprofData_added(java.lang.String)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>String</code>)</b>&nbsp;in&nbsp;dalvik.system.VMDebug
+</A></nobr><br>
+<!-- Method dumpSpans -->
+<nobr><A HREF="android.text.TextUtils.html#android.text.TextUtils.dumpSpans_added(java.lang.CharSequence, android.util.Printer, java.lang.String)" class="hiddenlink" target="rightframe"><b>dumpSpans</b>
+(<code>CharSequence, Printer, String</code>)</A></nobr><br>
+<!-- Constructor DynamicDrawableSpan -->
+<nobr><A HREF="android.text.style.DynamicDrawableSpan.html#android.text.style.DynamicDrawableSpan.ctor_added(int)" class="hiddenlink" target="rightframe"><b>DynamicDrawableSpan</b>
+(<code>int</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Field editorExtras -->
+<A NAME="E"></A>
+<br><font size="+2">E</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.R.attr.html#android.R.attr.editorExtras" class="hiddenlink" target="rightframe">editorExtras</A>
+</nobr><br>
+<!-- Method endBatchEdit -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.endBatchEdit_added()" class="hiddenlink" target="rightframe"><b>endBatchEdit</b>
+()</A></nobr><br>
+<!-- Field EXTRA_APPLICATION_ID -->
+<nobr><A HREF="android.provider.Browser.html#android.provider.Browser.EXTRA_APPLICATION_ID" class="hiddenlink" target="rightframe">EXTRA_APPLICATION_ID</A>
+</nobr><br>
+<!-- Field EXTRA_CREATE_DESCRIPTION -->
+<nobr><A HREF="android.provider.Contacts.Intents.html#android.provider.Contacts.Intents.EXTRA_CREATE_DESCRIPTION" class="hiddenlink" target="rightframe">EXTRA_CREATE_DESCRIPTION</A>
+</nobr><br>
+<!-- Field EXTRA_DATA_REMOVED -->
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.EXTRA_DATA_REMOVED" class="hiddenlink" target="rightframe">EXTRA_DATA_REMOVED</A>
+</nobr><br>
+<!-- Field EXTRA_FINISH_ON_COMPLETION -->
+<nobr><A HREF="android.provider.MediaStore.html#android.provider.MediaStore.EXTRA_FINISH_ON_COMPLETION" class="hiddenlink" target="rightframe">EXTRA_FINISH_ON_COMPLETION</A>
+</nobr><br>
+<!-- Field EXTRA_FORCE_CREATE -->
+<nobr><A HREF="android.provider.Contacts.Intents.html#android.provider.Contacts.Intents.EXTRA_FORCE_CREATE" class="hiddenlink" target="rightframe">EXTRA_FORCE_CREATE</A>
+</nobr><br>
+<!-- Field EXTRA_INCOMING_NUMBER -->
+<nobr><A HREF="android.telephony.TelephonyManager.html#android.telephony.TelephonyManager.EXTRA_INCOMING_NUMBER" class="hiddenlink" target="rightframe">EXTRA_INCOMING_NUMBER</A>
+</nobr><br>
+<!-- Field EXTRA_MAX_BYTES -->
+<nobr><A HREF="android.provider.MediaStore.Audio.Media.html#android.provider.MediaStore.Audio.Media.EXTRA_MAX_BYTES" class="hiddenlink" target="rightframe">EXTRA_MAX_BYTES</A>
+</nobr><br>
+<!-- Field EXTRA_MEDIA_ALBUM -->
+<nobr><A HREF="android.provider.MediaStore.html#android.provider.MediaStore.EXTRA_MEDIA_ALBUM" class="hiddenlink" target="rightframe">EXTRA_MEDIA_ALBUM</A>
+</nobr><br>
+<!-- Field EXTRA_MEDIA_ARTIST -->
+<nobr><A HREF="android.provider.MediaStore.html#android.provider.MediaStore.EXTRA_MEDIA_ARTIST" class="hiddenlink" target="rightframe">EXTRA_MEDIA_ARTIST</A>
+</nobr><br>
+<!-- Field EXTRA_MEDIA_FOCUS -->
+<nobr><A HREF="android.provider.MediaStore.html#android.provider.MediaStore.EXTRA_MEDIA_FOCUS" class="hiddenlink" target="rightframe">EXTRA_MEDIA_FOCUS</A>
+</nobr><br>
+<!-- Field EXTRA_MEDIA_TITLE -->
+<nobr><A HREF="android.provider.MediaStore.html#android.provider.MediaStore.EXTRA_MEDIA_TITLE" class="hiddenlink" target="rightframe">EXTRA_MEDIA_TITLE</A>
+</nobr><br>
+<!-- Field EXTRA_OUTPUT -->
+<nobr><A HREF="android.provider.MediaStore.html#android.provider.MediaStore.EXTRA_OUTPUT" class="hiddenlink" target="rightframe">EXTRA_OUTPUT</A>
+</nobr><br>
+<!-- Field EXTRA_REPLACING -->
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.EXTRA_REPLACING" class="hiddenlink" target="rightframe">EXTRA_REPLACING</A>
+</nobr><br>
+<!-- Field EXTRA_SCREEN_ORIENTATION -->
+<nobr><A HREF="android.provider.MediaStore.html#android.provider.MediaStore.EXTRA_SCREEN_ORIENTATION" class="hiddenlink" target="rightframe">EXTRA_SCREEN_ORIENTATION</A>
+</nobr><br>
+<!-- Field EXTRA_STATE -->
+<nobr><A HREF="android.telephony.TelephonyManager.html#android.telephony.TelephonyManager.EXTRA_STATE" class="hiddenlink" target="rightframe">EXTRA_STATE</A>
+</nobr><br>
+<!-- Field EXTRA_STATE_IDLE -->
+<nobr><A HREF="android.telephony.TelephonyManager.html#android.telephony.TelephonyManager.EXTRA_STATE_IDLE" class="hiddenlink" target="rightframe">EXTRA_STATE_IDLE</A>
+</nobr><br>
+<!-- Field EXTRA_STATE_OFFHOOK -->
+<nobr><A HREF="android.telephony.TelephonyManager.html#android.telephony.TelephonyManager.EXTRA_STATE_OFFHOOK" class="hiddenlink" target="rightframe">EXTRA_STATE_OFFHOOK</A>
+</nobr><br>
+<!-- Field EXTRA_STATE_RINGING -->
+<nobr><A HREF="android.telephony.TelephonyManager.html#android.telephony.TelephonyManager.EXTRA_STATE_RINGING" class="hiddenlink" target="rightframe">EXTRA_STATE_RINGING</A>
+</nobr><br>
+<!-- Field EXTRA_VIDEO_QUALITY -->
+<nobr><A HREF="android.provider.MediaStore.html#android.provider.MediaStore.EXTRA_VIDEO_QUALITY" class="hiddenlink" target="rightframe">EXTRA_VIDEO_QUALITY</A>
+</nobr><br>
+<!-- Field extractArea -->
+<nobr><A HREF="android.R.id.html#android.R.id.extractArea" class="hiddenlink" target="rightframe">extractArea</A>
+</nobr><br>
+<!-- Method extractText -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.extractText_added(android.view.inputmethod.ExtractedTextRequest, android.view.inputmethod.ExtractedText)" class="hiddenlink" target="rightframe"><b>extractText</b>
+(<code>ExtractedTextRequest, ExtractedText</code>)</A></nobr><br>
+<!-- Field fastScrollEnabled -->
+<A NAME="F"></A>
+<br><font size="+2">F</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.R.attr.html#android.R.attr.fastScrollEnabled" class="hiddenlink" target="rightframe">fastScrollEnabled</A>
+</nobr><br>
+<!-- Field fillEnabled -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.fillEnabled" class="hiddenlink" target="rightframe">fillEnabled</A>
+</nobr><br>
+<!-- Method findAll -->
+<nobr><A HREF="android.webkit.WebView.html#android.webkit.WebView.findAll_added(java.lang.String)" class="hiddenlink" target="rightframe"><b>findAll</b>
+(<code>String</code>)</A></nobr><br>
+<!-- Method findNext -->
+<nobr><A HREF="android.webkit.WebView.html#android.webkit.WebView.findNext_added(boolean)" class="hiddenlink" target="rightframe"><b>findNext</b>
+(<code>boolean</code>)</A></nobr><br>
+<!-- Field FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET -->
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET" class="hiddenlink" target="rightframe">FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET</A>
+</nobr><br>
+<!-- Field FLAG_ACTIVITY_NO_USER_ACTION -->
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.FLAG_ACTIVITY_NO_USER_ACTION" class="hiddenlink" target="rightframe">FLAG_ACTIVITY_NO_USER_ACTION</A>
+</nobr><br>
+<!-- Field FLAG_ACTIVITY_REORDER_TO_FRONT -->
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.FLAG_ACTIVITY_REORDER_TO_FRONT" class="hiddenlink" target="rightframe">FLAG_ACTIVITY_REORDER_TO_FRONT</A>
+</nobr><br>
+<!-- Field FLAG_ALT_FOCUSABLE_IM -->
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM" class="hiddenlink" target="rightframe">FLAG_ALT_FOCUSABLE_IM</A>
+</nobr><br>
+<!-- Field FLAG_EDITOR_ACTION -->
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.FLAG_EDITOR_ACTION" class="hiddenlink" target="rightframe">FLAG_EDITOR_ACTION</A>
+</nobr><br>
+<!-- Field FLAG_FROM_SYSTEM -->
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.FLAG_FROM_SYSTEM" class="hiddenlink" target="rightframe">FLAG_FROM_SYSTEM</A>
+</nobr><br>
+<!-- Field FLAG_KEEP_TOUCH_MODE -->
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.FLAG_KEEP_TOUCH_MODE" class="hiddenlink" target="rightframe">FLAG_KEEP_TOUCH_MODE</A>
+</nobr><br>
+<!-- Field FLAG_NO_HISTORY -->
+<nobr><A HREF="android.content.pm.ActivityInfo.html#android.content.pm.ActivityInfo.FLAG_NO_HISTORY" class="hiddenlink" target="rightframe">FLAG_NO_HISTORY</A>
+</nobr><br>
+<!-- Field FLAG_SOFT_KEYBOARD -->
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.FLAG_SOFT_KEYBOARD" class="hiddenlink" target="rightframe">FLAG_SOFT_KEYBOARD</A>
+</nobr><br>
+<!-- Field FLAG_UPDATE_CURRENT -->
+<nobr><A HREF="android.app.PendingIntent.html#android.app.PendingIntent.FLAG_UPDATE_CURRENT" class="hiddenlink" target="rightframe">FLAG_UPDATE_CURRENT</A>
+</nobr><br>
+<!-- Field FLAG_WATCH_OUTSIDE_TOUCH -->
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH" class="hiddenlink" target="rightframe">FLAG_WATCH_OUTSIDE_TOUCH</A>
+</nobr><br>
+<!-- Field footerDividersEnabled -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.footerDividersEnabled" class="hiddenlink" target="rightframe">footerDividersEnabled</A>
+</nobr><br>
+<!-- Constructor ForegroundColorSpan -->
+<nobr><A HREF="android.text.style.ForegroundColorSpan.html#android.text.style.ForegroundColorSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>ForegroundColorSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Method forkAndSpecialize -->
+<nobr><A HREF="dalvik.system.Zygote.html#dalvik.system.Zygote.forkAndSpecialize_added(int, int, int[], int, int[][])" class="hiddenlink" target="rightframe"><b>forkAndSpecialize</b>
+(<code>int, int, int[], int, int[][]</code>)</A></nobr><br>
+<!-- Method forkSystemServer -->
+<nobr><A HREF="dalvik.system.Zygote.html#dalvik.system.Zygote.forkSystemServer_added(int, int, int[], int, int[][])" class="hiddenlink" target="rightframe"><b>forkSystemServer</b>
+(<code>int, int, int[], int, int[][]</code>)</A></nobr><br>
+<!-- Field FORMAT_JAPAN -->
+<nobr><A HREF="android.telephony.PhoneNumberUtils.html#android.telephony.PhoneNumberUtils.FORMAT_JAPAN" class="hiddenlink" target="rightframe">FORMAT_JAPAN</A>
+</nobr><br>
+<!-- Method formatJapaneseNumber -->
+<nobr><A HREF="android.telephony.PhoneNumberUtils.html#android.telephony.PhoneNumberUtils.formatJapaneseNumber_added(android.text.Editable)" class="hiddenlink" target="rightframe"><b>formatJapaneseNumber</b>
+(<code>Editable</code>)</A></nobr><br>
+<!-- Field FX_KEYPRESS_DELETE -->
+<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.FX_KEYPRESS_DELETE" class="hiddenlink" target="rightframe">FX_KEYPRESS_DELETE</A>
+</nobr><br>
+<!-- Field FX_KEYPRESS_RETURN -->
+<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.FX_KEYPRESS_RETURN" class="hiddenlink" target="rightframe">FX_KEYPRESS_RETURN</A>
+</nobr><br>
+<!-- Field FX_KEYPRESS_SPACEBAR -->
+<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.FX_KEYPRESS_SPACEBAR" class="hiddenlink" target="rightframe">FX_KEYPRESS_SPACEBAR</A>
+</nobr><br>
+<!-- Field FX_KEYPRESS_STANDARD -->
+<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.FX_KEYPRESS_STANDARD" class="hiddenlink" target="rightframe">FX_KEYPRESS_STANDARD</A>
+</nobr><br>
+<!-- Class GeomagneticField -->
+<A NAME="G"></A>
+<br><font size="+2">G</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="pkg_android.hardware.html#GeomagneticField" class="hiddenlink" target="rightframe"><b>GeomagneticField</b></A><br>
+<!-- Constructor GestureDetector -->
+<i>GestureDetector</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.view.GestureDetector.html#android.view.GestureDetector.ctor_added(android.content.Context, android.view.GestureDetector.OnGestureListener)" class="hiddenlink" target="rightframe"><b>GestureDetector</b>
+(<code>Context, OnGestureListener</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Constructor GestureDetector -->
+&nbsp;&nbsp;<nobr><A HREF="android.view.GestureDetector.html#android.view.GestureDetector.ctor_added(android.content.Context, android.view.GestureDetector.OnGestureListener, android.os.Handler)" class="hiddenlink" target="rightframe"><b>GestureDetector</b>
+(<code>Context, OnGestureListener, Handler</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Class GestureDetector.OnDoubleTapListener -->
+<A HREF="pkg_android.view.html#GestureDetector.OnDoubleTapListener" class="hiddenlink" target="rightframe"><b><i>GestureDetector.OnDoubleTapListener</i></b></A><br>
+<!-- Method get -->
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.get_added(android.content.Context)" class="hiddenlink" target="rightframe"><b>get</b>
+(<code>Context</code>)</A></nobr><br>
+<!-- Field GET_CONFIGURATIONS -->
+<nobr><A HREF="android.content.pm.PackageManager.html#android.content.pm.PackageManager.GET_CONFIGURATIONS" class="hiddenlink" target="rightframe">GET_CONFIGURATIONS</A>
+</nobr><br>
+<!-- Field GET_UNINSTALLED_PACKAGES -->
+<nobr><A HREF="android.content.pm.PackageManager.html#android.content.pm.PackageManager.GET_UNINSTALLED_PACKAGES" class="hiddenlink" target="rightframe">GET_UNINSTALLED_PACKAGES</A>
+</nobr><br>
+<!-- Method getAllowFileAccess -->
+<nobr><A HREF="android.webkit.WebSettings.html#android.webkit.WebSettings.getAllowFileAccess_added()" class="hiddenlink" target="rightframe"><b>getAllowFileAccess</b>
+()</A></nobr><br>
+<!-- Method getBackgroundDataSetting -->
+<nobr><A HREF="android.net.ConnectivityManager.html#android.net.ConnectivityManager.getBackgroundDataSetting_added()" class="hiddenlink" target="rightframe"><b>getBackgroundDataSetting</b>
+()</A></nobr><br>
+<!-- Method getBoolean -->
+<nobr><A HREF="android.content.res.Resources.html#android.content.res.Resources.getBoolean_added(int)" class="hiddenlink" target="rightframe"><b>getBoolean</b>
+(<code>int</code>)</A></nobr><br>
+<!-- Method getBuiltInZoomControls -->
+<nobr><A HREF="android.webkit.WebSettings.html#android.webkit.WebSettings.getBuiltInZoomControls_added()" class="hiddenlink" target="rightframe"><b>getBuiltInZoomControls</b>
+()</A></nobr><br>
+<!-- Method getButton -->
+<nobr><A HREF="android.app.AlertDialog.html#android.app.AlertDialog.getButton_added(int)" class="hiddenlink" target="rightframe"><b>getButton</b>
+(<code>int</code>)</A></nobr><br>
+<!-- Method getCapsMode -->
+<nobr><A HREF="android.text.TextUtils.html#android.text.TextUtils.getCapsMode_added(java.lang.CharSequence, int, int)" class="hiddenlink" target="rightframe"><b>getCapsMode</b>
+(<code>CharSequence, int, int</code>)</A></nobr><br>
+<!-- Method getCharacters -->
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.getCharacters_added()" class="hiddenlink" target="rightframe"><b>getCharacters</b>
+()</A></nobr><br>
+<!-- Method getDeclaredLength -->
+<nobr><A HREF="android.content.res.AssetFileDescriptor.html#android.content.res.AssetFileDescriptor.getDeclaredLength_added()" class="hiddenlink" target="rightframe"><b>getDeclaredLength</b>
+()</A></nobr><br>
+<!-- Method getDefaultSensor -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.getDefaultSensor_added(int)" class="hiddenlink" target="rightframe"><b>getDefaultSensor</b>
+(<code>int</code>)</A></nobr><br>
+<!-- Method getDeviceConfigurationInfo -->
+<nobr><A HREF="android.app.ActivityManager.html#android.app.ActivityManager.getDeviceConfigurationInfo_added()" class="hiddenlink" target="rightframe"><b>getDeviceConfigurationInfo</b>
+()</A></nobr><br>
+<!-- Method getDialog -->
+<nobr><A HREF="android.preference.DialogPreference.html#android.preference.DialogPreference.getDialog_added()" class="hiddenlink" target="rightframe"><b>getDialog</b>
+()</A></nobr><br>
+<!-- Method getDoubleTapTimeout -->
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getDoubleTapTimeout_added()" class="hiddenlink" target="rightframe"><b>getDoubleTapTimeout</b>
+()</A></nobr><br>
+<!-- Method getDrawable -->
+<i>getDrawable</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.graphics.drawable.RotateDrawable.html#android.graphics.drawable.RotateDrawable.getDrawable_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.graphics.drawable.RotateDrawable
+</A></nobr><br>
+<!-- Method getDrawable -->
+&nbsp;&nbsp;<nobr><A HREF="android.graphics.drawable.ScaleDrawable.html#android.graphics.drawable.ScaleDrawable.getDrawable_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.graphics.drawable.ScaleDrawable
+</A></nobr><br>
+<!-- Method getDropDownAnchor -->
+<nobr><A HREF="android.widget.AutoCompleteTextView.html#android.widget.AutoCompleteTextView.getDropDownAnchor_added()" class="hiddenlink" target="rightframe"><b>getDropDownAnchor</b>
+()</A></nobr><br>
+<!-- Method getDropDownWidth -->
+<nobr><A HREF="android.widget.AutoCompleteTextView.html#android.widget.AutoCompleteTextView.getDropDownWidth_added()" class="hiddenlink" target="rightframe"><b>getDropDownWidth</b>
+()</A></nobr><br>
+<!-- Method getEditableText -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.getEditableText_added()" class="hiddenlink" target="rightframe"><b>getEditableText</b>
+()</A></nobr><br>
+<!-- Method getFraction -->
+<nobr><A HREF="android.content.res.Resources.html#android.content.res.Resources.getFraction_added(int, int, int)" class="hiddenlink" target="rightframe"><b>getFraction</b>
+(<code>int, int, int</code>)</A></nobr><br>
+<!-- Method getGpsStatus -->
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.getGpsStatus_added(android.location.GpsStatus)" class="hiddenlink" target="rightframe"><b>getGpsStatus</b>
+(<code>GpsStatus</code>)</A></nobr><br>
+<!-- Method getImeActionId -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.getImeActionId_added()" class="hiddenlink" target="rightframe"><b>getImeActionId</b>
+()</A></nobr><br>
+<!-- Method getImeActionLabel -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.getImeActionLabel_added()" class="hiddenlink" target="rightframe"><b>getImeActionLabel</b>
+()</A></nobr><br>
+<!-- Method getImeOptions -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.getImeOptions_added()" class="hiddenlink" target="rightframe"><b>getImeOptions</b>
+()</A></nobr><br>
+<!-- Method getInclination -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.getInclination_added(float[])" class="hiddenlink" target="rightframe"><b>getInclination</b>
+(<code>float[]</code>)</A></nobr><br>
+<!-- Method getInitialScrollX -->
+<nobr><A HREF="android.text.method.Touch.html#android.text.method.Touch.getInitialScrollX_added(android.widget.TextView, android.text.Spannable)" class="hiddenlink" target="rightframe"><b>getInitialScrollX</b>
+(<code>TextView, Spannable</code>)</A></nobr><br>
+<!-- Method getInitialScrollY -->
+<nobr><A HREF="android.text.method.Touch.html#android.text.method.Touch.getInitialScrollY_added(android.widget.TextView, android.text.Spannable)" class="hiddenlink" target="rightframe"><b>getInitialScrollY</b>
+(<code>TextView, Spannable</code>)</A></nobr><br>
+<!-- Method getInputExtras -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.getInputExtras_added(boolean)" class="hiddenlink" target="rightframe"><b>getInputExtras</b>
+(<code>boolean</code>)</A></nobr><br>
+<!-- Method getInputMethodMode -->
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.getInputMethodMode_added()" class="hiddenlink" target="rightframe"><b>getInputMethodMode</b>
+()</A></nobr><br>
+<!-- Method getInputType -->
+<i>getInputType</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.DateKeyListener.html#android.text.method.DateKeyListener.getInputType_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.method.DateKeyListener
+</A></nobr><br>
+<!-- Method getInputType -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.DateTimeKeyListener.html#android.text.method.DateTimeKeyListener.getInputType_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.method.DateTimeKeyListener
+</A></nobr><br>
+<!-- Method getInputType -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.DialerKeyListener.html#android.text.method.DialerKeyListener.getInputType_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.method.DialerKeyListener
+</A></nobr><br>
+<!-- Method getInputType -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.DigitsKeyListener.html#android.text.method.DigitsKeyListener.getInputType_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.method.DigitsKeyListener
+</A></nobr><br>
+<!-- Method getInputType -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.KeyListener.html#android.text.method.KeyListener.getInputType_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.method.KeyListener
+</A></nobr><br>
+<!-- Method getInputType -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.MultiTapKeyListener.html#android.text.method.MultiTapKeyListener.getInputType_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.method.MultiTapKeyListener
+</A></nobr><br>
+<!-- Method getInputType -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.QwertyKeyListener.html#android.text.method.QwertyKeyListener.getInputType_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.method.QwertyKeyListener
+</A></nobr><br>
+<!-- Method getInputType -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.TextKeyListener.html#android.text.method.TextKeyListener.getInputType_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.method.TextKeyListener
+</A></nobr><br>
+<!-- Method getInputType -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.TimeKeyListener.html#android.text.method.TimeKeyListener.getInputType_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.method.TimeKeyListener
+</A></nobr><br>
+<!-- Method getInputType -->
+&nbsp;&nbsp;<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.getInputType_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.widget.TextView
+</A></nobr><br>
+<!-- Method getItem -->
+<nobr><A HREF="android.view.Menu.html#android.view.Menu.getItem_added(int)" class="hiddenlink" target="rightframe"><b>getItem</b>
+(<code>int</code>)</A></nobr><br>
+<!-- Method getKeyProgressIncrement -->
+<nobr><A HREF="android.widget.AbsSeekBar.html#android.widget.AbsSeekBar.getKeyProgressIncrement_added()" class="hiddenlink" target="rightframe"><b>getKeyProgressIncrement</b>
+()</A></nobr><br>
+<!-- Method getLaunchIntentForPackage -->
+<i>getLaunchIntentForPackage</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.content.pm.PackageManager.html#android.content.pm.PackageManager.getLaunchIntentForPackage_added(java.lang.String)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>String</code>)</b>&nbsp;in&nbsp;android.content.pm.PackageManager
+</A></nobr><br>
+<!-- Method getLaunchIntentForPackage -->
+&nbsp;&nbsp;<nobr><A HREF="android.test.mock.MockPackageManager.html#android.test.mock.MockPackageManager.getLaunchIntentForPackage_added(java.lang.String)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>String</code>)</b>&nbsp;in&nbsp;android.test.mock.MockPackageManager
+</A></nobr><br>
+<!-- Method getLayoutDimension -->
+<nobr><A HREF="android.content.res.TypedArray.html#android.content.res.TypedArray.getLayoutDimension_added(int, int)" class="hiddenlink" target="rightframe"><b>getLayoutDimension</b>
+(<code>int, int</code>)</A></nobr><br>
+<!-- Method getListSelection -->
+<nobr><A HREF="android.widget.AutoCompleteTextView.html#android.widget.AutoCompleteTextView.getListSelection_added()" class="hiddenlink" target="rightframe"><b>getListSelection</b>
+()</A></nobr><br>
+<!-- Method getListView -->
+<nobr><A HREF="android.app.AlertDialog.html#android.app.AlertDialog.getListView_added()" class="hiddenlink" target="rightframe"><b>getListView</b>
+()</A></nobr><br>
+<!-- Method getLoggingMXBean -->
+<nobr><A HREF="java.util.logging.LogManager.html#java.util.logging.LogManager.getLoggingMXBean_added()" class="hiddenlink" target="rightframe"><b>getLoggingMXBean</b>
+()</A></nobr><br>
+<!-- Method getLong -->
+<i>getLong</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.getLong_added(android.content.ContentResolver, java.lang.String)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>ContentResolver, String</code>)</b>&nbsp;in&nbsp;android.provider.Settings.System
+</A></nobr><br>
+<!-- Method getLong -->
+&nbsp;&nbsp;<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.getLong_added(android.content.ContentResolver, java.lang.String, long)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>ContentResolver, String, long</code>)</b>&nbsp;in&nbsp;android.provider.Settings.System
+</A></nobr><br>
+<!-- Method getMaxAvailableHeight -->
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.getMaxAvailableHeight_added(android.view.View, int)" class="hiddenlink" target="rightframe"><b>getMaxAvailableHeight</b>
+(<code>View, int</code>)</A></nobr><br>
+<!-- Method getMaxKeyCode -->
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.getMaxKeyCode_added()" class="hiddenlink" target="rightframe"><b>getMaxKeyCode</b>
+()</A></nobr><br>
+<!-- Method getMetaState -->
+<i>getMetaState</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.MetaKeyKeyListener.html#android.text.method.MetaKeyKeyListener.getMetaState_added(long)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>long</code>)</b>&nbsp;in&nbsp;android.text.method.MetaKeyKeyListener
+</A></nobr><br>
+<!-- Method getMetaState -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.MetaKeyKeyListener.html#android.text.method.MetaKeyKeyListener.getMetaState_added(long, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>long, int</code>)</b>&nbsp;in&nbsp;android.text.method.MetaKeyKeyListener
+</A></nobr><br>
+<!-- Method getNeighboringCellInfo -->
+<nobr><A HREF="android.telephony.TelephonyManager.html#android.telephony.TelephonyManager.getNeighboringCellInfo_added()" class="hiddenlink" target="rightframe"><b>getNeighboringCellInfo</b>
+()</A></nobr><br>
+<!-- Method getOnChronometerTickListener -->
+<nobr><A HREF="android.widget.Chronometer.html#android.widget.Chronometer.getOnChronometerTickListener_added()" class="hiddenlink" target="rightframe"><b>getOnChronometerTickListener</b>
+()</A></nobr><br>
+<!-- Method getOnItemClickListener -->
+<nobr><A HREF="android.widget.AutoCompleteTextView.html#android.widget.AutoCompleteTextView.getOnItemClickListener_added()" class="hiddenlink" target="rightframe"><b>getOnItemClickListener</b>
+()</A></nobr><br>
+<!-- Method getOnItemSelectedListener -->
+<nobr><A HREF="android.widget.AutoCompleteTextView.html#android.widget.AutoCompleteTextView.getOnItemSelectedListener_added()" class="hiddenlink" target="rightframe"><b>getOnItemSelectedListener</b>
+()</A></nobr><br>
+<!-- Method getOrientation -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.getOrientation_added(float[], float[])" class="hiddenlink" target="rightframe"><b>getOrientation</b>
+(<code>float[], float[]</code>)</A></nobr><br>
+<!-- Method getOriginalUrl -->
+<i>getOriginalUrl</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.webkit.WebHistoryItem.html#android.webkit.WebHistoryItem.getOriginalUrl_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.webkit.WebHistoryItem
+</A></nobr><br>
+<!-- Method getOriginalUrl -->
+&nbsp;&nbsp;<nobr><A HREF="android.webkit.WebView.html#android.webkit.WebView.getOriginalUrl_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.webkit.WebView
+</A></nobr><br>
+<!-- Method getPluginData -->
+<i>getPluginData</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.webkit.UrlInterceptHandler.html#android.webkit.UrlInterceptHandler.getPluginData_added(java.lang.String, java.util.Map<java.lang.String, java.lang.String>)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>String, Map&lt;String, String&gt;</code>)</b>&nbsp;in&nbsp;android.webkit.UrlInterceptHandler
+</A></nobr><br>
+<!-- Method getPluginData -->
+&nbsp;&nbsp;<nobr><A HREF="android.webkit.UrlInterceptRegistry.html#android.webkit.UrlInterceptRegistry.getPluginData_added(java.lang.String, java.util.Map<java.lang.String, java.lang.String>)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>String, Map&lt;String, String&gt;</code>)</b>&nbsp;in&nbsp;android.webkit.UrlInterceptRegistry
+</A></nobr><br>
+<!-- Method getPrivateImeOptions -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.getPrivateImeOptions_added()" class="hiddenlink" target="rightframe"><b>getPrivateImeOptions</b>
+()</A></nobr><br>
+<!-- Method getRotationMatrix -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.getRotationMatrix_added(float[], float[], float[], float[])" class="hiddenlink" target="rightframe"><b>getRotationMatrix</b>
+(<code>float[], float[], float[], float[]</code>)</A></nobr><br>
+<!-- Method getRunningAppProcesses -->
+<nobr><A HREF="android.app.ActivityManager.html#android.app.ActivityManager.getRunningAppProcesses_added()" class="hiddenlink" target="rightframe"><b>getRunningAppProcesses</b>
+()</A></nobr><br>
+<!-- Method getScaledDoubleTapSlop -->
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getScaledDoubleTapSlop_added()" class="hiddenlink" target="rightframe"><b>getScaledDoubleTapSlop</b>
+()</A></nobr><br>
+<!-- Method getScaledEdgeSlop -->
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getScaledEdgeSlop_added()" class="hiddenlink" target="rightframe"><b>getScaledEdgeSlop</b>
+()</A></nobr><br>
+<!-- Method getScaledFadingEdgeLength -->
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getScaledFadingEdgeLength_added()" class="hiddenlink" target="rightframe"><b>getScaledFadingEdgeLength</b>
+()</A></nobr><br>
+<!-- Method getScaledMaximumDrawingCacheSize -->
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getScaledMaximumDrawingCacheSize_added()" class="hiddenlink" target="rightframe"><b>getScaledMaximumDrawingCacheSize</b>
+()</A></nobr><br>
+<!-- Method getScaledMinimumFlingVelocity -->
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getScaledMinimumFlingVelocity_added()" class="hiddenlink" target="rightframe"><b>getScaledMinimumFlingVelocity</b>
+()</A></nobr><br>
+<!-- Method getScaledScrollBarSize -->
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getScaledScrollBarSize_added()" class="hiddenlink" target="rightframe"><b>getScaledScrollBarSize</b>
+()</A></nobr><br>
+<!-- Method getScaledTouchSlop -->
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getScaledTouchSlop_added()" class="hiddenlink" target="rightframe"><b>getScaledTouchSlop</b>
+()</A></nobr><br>
+<!-- Method getScaledWindowTouchSlop -->
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getScaledWindowTouchSlop_added()" class="hiddenlink" target="rightframe"><b>getScaledWindowTouchSlop</b>
+()</A></nobr><br>
+<!-- Method getSensorList -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.getSensorList_added(int)" class="hiddenlink" target="rightframe"><b>getSensorList</b>
+(<code>int</code>)</A></nobr><br>
+<!-- Method getSize -->
+<nobr><A HREF="android.text.AutoText.html#android.text.AutoText.getSize_added(android.view.View)" class="hiddenlink" target="rightframe"><b>getSize</b>
+(<code>View</code>)</A></nobr><br>
+<!-- Method getSpanTypeId -->
+<i>getSpanTypeId</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.Annotation.html#android.text.Annotation.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.Annotation
+</A></nobr><br>
+<!-- Method getSpanTypeId -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.AbsoluteSizeSpan.html#android.text.style.AbsoluteSizeSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.AbsoluteSizeSpan
+</A></nobr><br>
+<!-- Method getSpanTypeId -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.AlignmentSpan.Standard.html#android.text.style.AlignmentSpan.Standard.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.AlignmentSpan.Standard
+</A></nobr><br>
+<!-- Method getSpanTypeId -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.BackgroundColorSpan.html#android.text.style.BackgroundColorSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.BackgroundColorSpan
+</A></nobr><br>
+<!-- Method getSpanTypeId -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.BulletSpan.html#android.text.style.BulletSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.BulletSpan
+</A></nobr><br>
+<!-- Method getSpanTypeId -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.ForegroundColorSpan.html#android.text.style.ForegroundColorSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.ForegroundColorSpan
+</A></nobr><br>
+<!-- Method getSpanTypeId -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.LeadingMarginSpan.Standard.html#android.text.style.LeadingMarginSpan.Standard.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.LeadingMarginSpan.Standard
+</A></nobr><br>
+<!-- Method getSpanTypeId -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.QuoteSpan.html#android.text.style.QuoteSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.QuoteSpan
+</A></nobr><br>
+<!-- Method getSpanTypeId -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.RelativeSizeSpan.html#android.text.style.RelativeSizeSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.RelativeSizeSpan
+</A></nobr><br>
+<!-- Method getSpanTypeId -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.ScaleXSpan.html#android.text.style.ScaleXSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.ScaleXSpan
+</A></nobr><br>
+<!-- Method getSpanTypeId -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.StrikethroughSpan.html#android.text.style.StrikethroughSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.StrikethroughSpan
+</A></nobr><br>
+<!-- Method getSpanTypeId -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.StyleSpan.html#android.text.style.StyleSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.StyleSpan
+</A></nobr><br>
+<!-- Method getSpanTypeId -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.SubscriptSpan.html#android.text.style.SubscriptSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.SubscriptSpan
+</A></nobr><br>
+<!-- Method getSpanTypeId -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.SuperscriptSpan.html#android.text.style.SuperscriptSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.SuperscriptSpan
+</A></nobr><br>
+<!-- Method getSpanTypeId -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.TextAppearanceSpan.html#android.text.style.TextAppearanceSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.TextAppearanceSpan
+</A></nobr><br>
+<!-- Method getSpanTypeId -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.TypefaceSpan.html#android.text.style.TypefaceSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.TypefaceSpan
+</A></nobr><br>
+<!-- Method getSpanTypeId -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.URLSpan.html#android.text.style.URLSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.URLSpan
+</A></nobr><br>
+<!-- Method getSpanTypeId -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.UnderlineSpan.html#android.text.style.UnderlineSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.UnderlineSpan
+</A></nobr><br>
+<!-- Method getStartX -->
+<nobr><A HREF="android.widget.Scroller.html#android.widget.Scroller.getStartX_added()" class="hiddenlink" target="rightframe"><b>getStartX</b>
+()</A></nobr><br>
+<!-- Method getStartY -->
+<nobr><A HREF="android.widget.Scroller.html#android.widget.Scroller.getStartY_added()" class="hiddenlink" target="rightframe"><b>getStartY</b>
+()</A></nobr><br>
+<!-- Method getStatSize -->
+<nobr><A HREF="android.os.ParcelFileDescriptor.html#android.os.ParcelFileDescriptor.getStatSize_added()" class="hiddenlink" target="rightframe"><b>getStatSize</b>
+()</A></nobr><br>
+<!-- Method getSubtype -->
+<nobr><A HREF="android.net.NetworkInfo.html#android.net.NetworkInfo.getSubtype_added()" class="hiddenlink" target="rightframe"><b>getSubtype</b>
+()</A></nobr><br>
+<!-- Method getSubtypeName -->
+<nobr><A HREF="android.net.NetworkInfo.html#android.net.NetworkInfo.getSubtypeName_added()" class="hiddenlink" target="rightframe"><b>getSubtypeName</b>
+()</A></nobr><br>
+<!-- Method getSystemSharedLibraryNames -->
+<i>getSystemSharedLibraryNames</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.content.pm.PackageManager.html#android.content.pm.PackageManager.getSystemSharedLibraryNames_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.content.pm.PackageManager
+</A></nobr><br>
+<!-- Method getSystemSharedLibraryNames -->
+&nbsp;&nbsp;<nobr><A HREF="android.test.mock.MockPackageManager.html#android.test.mock.MockPackageManager.getSystemSharedLibraryNames_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.test.mock.MockPackageManager
+</A></nobr><br>
+<!-- Method getTextFilter -->
+<nobr><A HREF="android.widget.AbsListView.html#android.widget.AbsListView.getTextFilter_added()" class="hiddenlink" target="rightframe"><b>getTextFilter</b>
+()</A></nobr><br>
+<!-- Method getThread -->
+<nobr><A HREF="android.os.Looper.html#android.os.Looper.getThread_added()" class="hiddenlink" target="rightframe"><b>getThread</b>
+()</A></nobr><br>
+<!-- Method getTimeZoneDatabaseVersion -->
+<nobr><A HREF="android.util.TimeUtils.html#android.util.TimeUtils.getTimeZoneDatabaseVersion_added()" class="hiddenlink" target="rightframe"><b>getTimeZoneDatabaseVersion</b>
+()</A></nobr><br>
+<!-- Method getUserAgentString -->
+<nobr><A HREF="android.webkit.WebSettings.html#android.webkit.WebSettings.getUserAgentString_added()" class="hiddenlink" target="rightframe"><b>getUserAgentString</b>
+()</A></nobr><br>
+<!-- Method getVerticalAlignment -->
+<nobr><A HREF="android.text.style.DynamicDrawableSpan.html#android.text.style.DynamicDrawableSpan.getVerticalAlignment_added()" class="hiddenlink" target="rightframe"><b>getVerticalAlignment</b>
+()</A></nobr><br>
+<!-- Method getWindowVisibleDisplayFrame -->
+<nobr><A HREF="android.view.View.html#android.view.View.getWindowVisibleDisplayFrame_added(android.graphics.Rect)" class="hiddenlink" target="rightframe"><b>getWindowVisibleDisplayFrame</b>
+(<code>Rect</code>)</A></nobr><br>
+<!-- Class GLSurfaceView -->
+<A HREF="pkg_android.opengl.html#GLSurfaceView" class="hiddenlink" target="rightframe"><b>GLSurfaceView</b></A><br>
+<!-- Class GLSurfaceView.EGLConfigChooser -->
+<A HREF="pkg_android.opengl.html#GLSurfaceView.EGLConfigChooser" class="hiddenlink" target="rightframe"><b><i>GLSurfaceView.EGLConfigChooser</i></b></A><br>
+<!-- Class GLSurfaceView.GLWrapper -->
+<A HREF="pkg_android.opengl.html#GLSurfaceView.GLWrapper" class="hiddenlink" target="rightframe"><b><i>GLSurfaceView.GLWrapper</i></b></A><br>
+<!-- Class GLSurfaceView.Renderer -->
+<A HREF="pkg_android.opengl.html#GLSurfaceView.Renderer" class="hiddenlink" target="rightframe"><b><i>GLSurfaceView.Renderer</i></b></A><br>
+<!-- Class GpsSatellite -->
+<A HREF="pkg_android.location.html#GpsSatellite" class="hiddenlink" target="rightframe"><b>GpsSatellite</b></A><br>
+<!-- Class GpsStatus -->
+<A HREF="pkg_android.location.html#GpsStatus" class="hiddenlink" target="rightframe"><b>GpsStatus</b></A><br>
+<!-- Class GpsStatus.Listener -->
+<A HREF="pkg_android.location.html#GpsStatus.Listener" class="hiddenlink" target="rightframe"><b><i>GpsStatus.Listener</i></b></A><br>
+<!-- Field handle -->
+<A NAME="H"></A>
+<br><font size="+2">H</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.R.attr.html#android.R.attr.handle" class="hiddenlink" target="rightframe">handle</A>
+</nobr><br>
+<!-- Method handleKeyDown -->
+<nobr><A HREF="android.text.method.MetaKeyKeyListener.html#android.text.method.MetaKeyKeyListener.handleKeyDown_added(long, int, android.view.KeyEvent)" class="hiddenlink" target="rightframe"><b>handleKeyDown</b>
+(<code>long, int, KeyEvent</code>)</A></nobr><br>
+<!-- Method handleKeyUp -->
+<nobr><A HREF="android.text.method.MetaKeyKeyListener.html#android.text.method.MetaKeyKeyListener.handleKeyUp_added(long, int, android.view.KeyEvent)" class="hiddenlink" target="rightframe"><b>handleKeyUp</b>
+(<code>long, int, KeyEvent</code>)</A></nobr><br>
+<!-- Constructor Handler -->
+<i>Handler</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.os.Handler.html#android.os.Handler.ctor_added(android.os.Handler.Callback)" class="hiddenlink" target="rightframe"><b>Handler</b>
+(<code>Callback</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Constructor Handler -->
+&nbsp;&nbsp;<nobr><A HREF="android.os.Handler.html#android.os.Handler.ctor_added(android.os.Looper, android.os.Handler.Callback)" class="hiddenlink" target="rightframe"><b>Handler</b>
+(<code>Looper, Callback</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Class Handler.Callback -->
+<A HREF="pkg_android.os.html#Handler.Callback" class="hiddenlink" target="rightframe"><b><i>Handler.Callback</i></b></A><br>
+<!-- Field HAPTIC_FEEDBACK_ENABLED -->
+<i>HAPTIC_FEEDBACK_ENABLED</i><br>
+&nbsp;in&nbsp;
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.HAPTIC_FEEDBACK_ENABLED" class="hiddenlink" target="rightframe">android.provider.Settings.System</A>
+</nobr><br>
+<!-- Field HAPTIC_FEEDBACK_ENABLED -->
+&nbsp;in&nbsp;
+<nobr><A HREF="android.view.View.html#android.view.View.HAPTIC_FEEDBACK_ENABLED" class="hiddenlink" target="rightframe">android.view.View</A>
+</nobr><br>
+<!-- Class HapticFeedbackConstants -->
+<A HREF="pkg_android.view.html#HapticFeedbackConstants" class="hiddenlink" target="rightframe"><b>HapticFeedbackConstants</b></A><br>
+<!-- Field hapticFeedbackEnabled -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.hapticFeedbackEnabled" class="hiddenlink" target="rightframe">hapticFeedbackEnabled</A>
+</nobr><br>
+<!-- Field hardKeyboardHidden -->
+<nobr><A HREF="android.content.res.Configuration.html#android.content.res.Configuration.hardKeyboardHidden" class="hiddenlink" target="rightframe">hardKeyboardHidden</A>
+</nobr><br>
+<!-- Field HARDKEYBOARDHIDDEN_NO -->
+<nobr><A HREF="android.content.res.Configuration.html#android.content.res.Configuration.HARDKEYBOARDHIDDEN_NO" class="hiddenlink" target="rightframe">HARDKEYBOARDHIDDEN_NO</A>
+</nobr><br>
+<!-- Field HARDKEYBOARDHIDDEN_UNDEFINED -->
+<nobr><A HREF="android.content.res.Configuration.html#android.content.res.Configuration.HARDKEYBOARDHIDDEN_UNDEFINED" class="hiddenlink" target="rightframe">HARDKEYBOARDHIDDEN_UNDEFINED</A>
+</nobr><br>
+<!-- Field HARDKEYBOARDHIDDEN_YES -->
+<nobr><A HREF="android.content.res.Configuration.html#android.content.res.Configuration.HARDKEYBOARDHIDDEN_YES" class="hiddenlink" target="rightframe">HARDKEYBOARDHIDDEN_YES</A>
+</nobr><br>
+<!-- Method hasSoftInputMode -->
+<nobr><A HREF="android.view.Window.html#android.view.Window.hasSoftInputMode_added()" class="hiddenlink" target="rightframe"><b>hasSoftInputMode</b>
+()</A></nobr><br>
+<!-- Method hasWindowFocus -->
+<nobr><A HREF="android.app.Activity.html#android.app.Activity.hasWindowFocus_added()" class="hiddenlink" target="rightframe"><b>hasWindowFocus</b>
+()</A></nobr><br>
+<!-- Field headerDividersEnabled -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.headerDividersEnabled" class="hiddenlink" target="rightframe">headerDividersEnabled</A>
+</nobr><br>
+<!-- Field horizontalGap -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.horizontalGap" class="hiddenlink" target="rightframe">horizontalGap</A>
+</nobr><br>
+<!-- Class HorizontalScrollView -->
+<A HREF="pkg_android.widget.html#HorizontalScrollView" class="hiddenlink" target="rightframe"><b>HorizontalScrollView</b></A><br>
+<!-- Field ic_btn_speak_now -->
+<A NAME="I"></A>
+<br><font size="+2">I</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.R.drawable.html#android.R.drawable.ic_btn_speak_now" class="hiddenlink" target="rightframe">ic_btn_speak_now</A>
+</nobr><br>
+<!-- Field iconPreview -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.iconPreview" class="hiddenlink" target="rightframe">iconPreview</A>
+</nobr><br>
+<!-- Constructor ImageSpan -->
+<i>ImageSpan</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.ImageSpan.html#android.text.style.ImageSpan.ctor_added(android.content.Context, android.net.Uri, int)" class="hiddenlink" target="rightframe"><b>ImageSpan</b>
+(<code>Context, Uri, int</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Constructor ImageSpan -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.ImageSpan.html#android.text.style.ImageSpan.ctor_added(android.content.Context, int, int)" class="hiddenlink" target="rightframe"><b>ImageSpan</b>
+(<code>Context, int, int</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Constructor ImageSpan -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.ImageSpan.html#android.text.style.ImageSpan.ctor_added(android.graphics.Bitmap, int)" class="hiddenlink" target="rightframe"><b>ImageSpan</b>
+(<code>Bitmap, int</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Constructor ImageSpan -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.ImageSpan.html#android.text.style.ImageSpan.ctor_added(android.graphics.drawable.Drawable, int)" class="hiddenlink" target="rightframe"><b>ImageSpan</b>
+(<code>Drawable, int</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Constructor ImageSpan -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.ImageSpan.html#android.text.style.ImageSpan.ctor_added(android.graphics.drawable.Drawable, java.lang.String, int)" class="hiddenlink" target="rightframe"><b>ImageSpan</b>
+(<code>Drawable, String, int</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Field imeActionId -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.imeActionId" class="hiddenlink" target="rightframe">imeActionId</A>
+</nobr><br>
+<!-- Field imeActionLabel -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.imeActionLabel" class="hiddenlink" target="rightframe">imeActionLabel</A>
+</nobr><br>
+<!-- Field imeExtractEnterAnimation -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.imeExtractEnterAnimation" class="hiddenlink" target="rightframe">imeExtractEnterAnimation</A>
+</nobr><br>
+<!-- Field imeExtractExitAnimation -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.imeExtractExitAnimation" class="hiddenlink" target="rightframe">imeExtractExitAnimation</A>
+</nobr><br>
+<!-- Field imeFullscreenBackground -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.imeFullscreenBackground" class="hiddenlink" target="rightframe">imeFullscreenBackground</A>
+</nobr><br>
+<!-- Field imeOptions -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.imeOptions" class="hiddenlink" target="rightframe">imeOptions</A>
+</nobr><br>
+<!-- Method inferStreamType -->
+<nobr><A HREF="android.media.RingtoneManager.html#android.media.RingtoneManager.inferStreamType_added()" class="hiddenlink" target="rightframe"><b>inferStreamType</b>
+()</A></nobr><br>
+<!-- Field initialLayout -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.initialLayout" class="hiddenlink" target="rightframe">initialLayout</A>
+</nobr><br>
+<!-- Field innerRadius -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.innerRadius" class="hiddenlink" target="rightframe">innerRadius</A>
+</nobr><br>
+<!-- Field INPUT_METHOD_FROM_FOCUSABLE -->
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.INPUT_METHOD_FROM_FOCUSABLE" class="hiddenlink" target="rightframe">INPUT_METHOD_FROM_FOCUSABLE</A>
+</nobr><br>
+<!-- Field INPUT_METHOD_NEEDED -->
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.INPUT_METHOD_NEEDED" class="hiddenlink" target="rightframe">INPUT_METHOD_NEEDED</A>
+</nobr><br>
+<!-- Field INPUT_METHOD_NOT_NEEDED -->
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.INPUT_METHOD_NOT_NEEDED" class="hiddenlink" target="rightframe">INPUT_METHOD_NOT_NEEDED</A>
+</nobr><br>
+<!-- Field INPUT_METHOD_SERVICE -->
+<nobr><A HREF="android.content.Context.html#android.content.Context.INPUT_METHOD_SERVICE" class="hiddenlink" target="rightframe">INPUT_METHOD_SERVICE</A>
+</nobr><br>
+<!-- Field inputArea -->
+<nobr><A HREF="android.R.id.html#android.R.id.inputArea" class="hiddenlink" target="rightframe">inputArea</A>
+</nobr><br>
+<!-- Field inputExtractEditText -->
+<nobr><A HREF="android.R.id.html#android.R.id.inputExtractEditText" class="hiddenlink" target="rightframe">inputExtractEditText</A>
+</nobr><br>
+<!-- Class InputType -->
+<A HREF="pkg_android.text.html#InputType" class="hiddenlink" target="rightframe"><b><i>InputType</i></b></A><br>
+<!-- Field inputType -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.inputType" class="hiddenlink" target="rightframe">inputType</A>
+</nobr><br>
+<!-- Field INSTALL_FAILED_CONFLICTING_PROVIDER -->
+<nobr><A HREF="android.content.pm.PackageManager.html#android.content.pm.PackageManager.INSTALL_FAILED_CONFLICTING_PROVIDER" class="hiddenlink" target="rightframe">INSTALL_FAILED_CONFLICTING_PROVIDER</A>
+</nobr><br>
+<!-- Field INTENT_ACTION_MEDIA_SEARCH -->
+<nobr><A HREF="android.provider.MediaStore.html#android.provider.MediaStore.INTENT_ACTION_MEDIA_SEARCH" class="hiddenlink" target="rightframe">INTENT_ACTION_MEDIA_SEARCH</A>
+</nobr><br>
+<!-- Field INTENT_ACTION_STILL_IMAGE_CAMERA -->
+<nobr><A HREF="android.provider.MediaStore.html#android.provider.MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA" class="hiddenlink" target="rightframe">INTENT_ACTION_STILL_IMAGE_CAMERA</A>
+</nobr><br>
+<!-- Field INTENT_ACTION_VIDEO_CAMERA -->
+<nobr><A HREF="android.provider.MediaStore.html#android.provider.MediaStore.INTENT_ACTION_VIDEO_CAMERA" class="hiddenlink" target="rightframe">INTENT_ACTION_VIDEO_CAMERA</A>
+</nobr><br>
+<!-- Method intentForPosition -->
+<nobr><A HREF="android.app.LauncherActivity.html#android.app.LauncherActivity.intentForPosition_added(int)" class="hiddenlink" target="rightframe"><b>intentForPosition</b>
+(<code>int</code>)</A></nobr><br>
+<!-- Class IntentService -->
+<A HREF="pkg_android.app.html#IntentService" class="hiddenlink" target="rightframe"><b>IntentService</b></A><br>
+<!-- Field INTERVAL_DAY -->
+<nobr><A HREF="android.app.AlarmManager.html#android.app.AlarmManager.INTERVAL_DAY" class="hiddenlink" target="rightframe">INTERVAL_DAY</A>
+</nobr><br>
+<!-- Field INTERVAL_FIFTEEN_MINUTES -->
+<nobr><A HREF="android.app.AlarmManager.html#android.app.AlarmManager.INTERVAL_FIFTEEN_MINUTES" class="hiddenlink" target="rightframe">INTERVAL_FIFTEEN_MINUTES</A>
+</nobr><br>
+<!-- Field INTERVAL_HALF_DAY -->
+<nobr><A HREF="android.app.AlarmManager.html#android.app.AlarmManager.INTERVAL_HALF_DAY" class="hiddenlink" target="rightframe">INTERVAL_HALF_DAY</A>
+</nobr><br>
+<!-- Field INTERVAL_HALF_HOUR -->
+<nobr><A HREF="android.app.AlarmManager.html#android.app.AlarmManager.INTERVAL_HALF_HOUR" class="hiddenlink" target="rightframe">INTERVAL_HALF_HOUR</A>
+</nobr><br>
+<!-- Field INTERVAL_HOUR -->
+<nobr><A HREF="android.app.AlarmManager.html#android.app.AlarmManager.INTERVAL_HOUR" class="hiddenlink" target="rightframe">INTERVAL_HOUR</A>
+</nobr><br>
+<!-- Method isAboveAnchor -->
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.isAboveAnchor_added()" class="hiddenlink" target="rightframe"><b>isAboveAnchor</b>
+()</A></nobr><br>
+<!-- Method isBluetoothA2dpOn -->
+<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.isBluetoothA2dpOn_added()" class="hiddenlink" target="rightframe"><b>isBluetoothA2dpOn</b>
+()</A></nobr><br>
+<!-- Method isClippingEnabled -->
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.isClippingEnabled_added()" class="hiddenlink" target="rightframe"><b>isClippingEnabled</b>
+()</A></nobr><br>
+<!-- Method isDebuggingEnabled -->
+<nobr><A HREF="dalvik.system.VMDebug.html#dalvik.system.VMDebug.isDebuggingEnabled_added()" class="hiddenlink" target="rightframe"><b>isDebuggingEnabled</b>
+()</A></nobr><br>
+<!-- Field isDefault -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.isDefault" class="hiddenlink" target="rightframe">isDefault</A>
+</nobr><br>
+<!-- Method isFastScrollEnabled -->
+<nobr><A HREF="android.widget.AbsListView.html#android.widget.AbsListView.isFastScrollEnabled_added()" class="hiddenlink" target="rightframe"><b>isFastScrollEnabled</b>
+()</A></nobr><br>
+<!-- Method isFillEnabled -->
+<nobr><A HREF="android.view.animation.Animation.html#android.view.animation.Animation.isFillEnabled_added()" class="hiddenlink" target="rightframe"><b>isFillEnabled</b>
+()</A></nobr><br>
+<!-- Method isHapticFeedbackEnabled -->
+<nobr><A HREF="android.view.View.html#android.view.View.isHapticFeedbackEnabled_added()" class="hiddenlink" target="rightframe"><b>isHapticFeedbackEnabled</b>
+()</A></nobr><br>
+<!-- Method isInEditMode -->
+<nobr><A HREF="android.view.View.html#android.view.View.isInEditMode_added()" class="hiddenlink" target="rightframe"><b>isInEditMode</b>
+()</A></nobr><br>
+<!-- Method isInputMethodTarget -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.isInputMethodTarget_added()" class="hiddenlink" target="rightframe"><b>isInputMethodTarget</b>
+()</A></nobr><br>
+<!-- Method isLooping -->
+<nobr><A HREF="android.media.MediaPlayer.html#android.media.MediaPlayer.isLooping_added()" class="hiddenlink" target="rightframe"><b>isLooping</b>
+()</A></nobr><br>
+<!-- Field isModifier -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.isModifier" class="hiddenlink" target="rightframe">isModifier</A>
+</nobr><br>
+<!-- Method isOutsideTouchable -->
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.isOutsideTouchable_added()" class="hiddenlink" target="rightframe"><b>isOutsideTouchable</b>
+()</A></nobr><br>
+<!-- Method isPerformingCompletion -->
+<nobr><A HREF="android.widget.AutoCompleteTextView.html#android.widget.AutoCompleteTextView.isPerformingCompletion_added()" class="hiddenlink" target="rightframe"><b>isPerformingCompletion</b>
+()</A></nobr><br>
+<!-- Field isRepeatable -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.isRepeatable" class="hiddenlink" target="rightframe">isRepeatable</A>
+</nobr><br>
+<!-- Method isRoaming -->
+<nobr><A HREF="android.net.NetworkInfo.html#android.net.NetworkInfo.isRoaming_added()" class="hiddenlink" target="rightframe"><b>isRoaming</b>
+()</A></nobr><br>
+<!-- Method isSafeMode -->
+<i>isSafeMode</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.content.pm.PackageManager.html#android.content.pm.PackageManager.isSafeMode_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.content.pm.PackageManager
+</A></nobr><br>
+<!-- Method isSafeMode -->
+&nbsp;&nbsp;<nobr><A HREF="android.test.mock.MockPackageManager.html#android.test.mock.MockPackageManager.isSafeMode_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.test.mock.MockPackageManager
+</A></nobr><br>
+<!-- Field isScrollContainer -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.isScrollContainer" class="hiddenlink" target="rightframe">isScrollContainer</A>
+</nobr><br>
+<!-- Method isSelectingMetaTracker -->
+<nobr><A HREF="android.text.method.MetaKeyKeyListener.html#android.text.method.MetaKeyKeyListener.isSelectingMetaTracker_added(java.lang.CharSequence, java.lang.Object)" class="hiddenlink" target="rightframe"><b>isSelectingMetaTracker</b>
+(<code>CharSequence, Object</code>)</A></nobr><br>
+<!-- Method isSmoothScrollbarEnabled -->
+<nobr><A HREF="android.widget.AbsListView.html#android.widget.AbsListView.isSmoothScrollbarEnabled_added()" class="hiddenlink" target="rightframe"><b>isSmoothScrollbarEnabled</b>
+()</A></nobr><br>
+<!-- Field isSticky -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.isSticky" class="hiddenlink" target="rightframe">isSticky</A>
+</nobr><br>
+<!-- Method isTouchable -->
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.isTouchable_added()" class="hiddenlink" target="rightframe"><b>isTouchable</b>
+()</A></nobr><br>
+<!-- Package java.beans -->
+<A NAME="J"></A>
+<A HREF="changes-summary.html#java.beans" class="hiddenlink" target="rightframe"><b>java.beans</b></A><br>
+<!-- Class JetPlayer -->
+<A HREF="pkg_android.media.html#JetPlayer" class="hiddenlink" target="rightframe"><b>JetPlayer</b></A><br>
+<!-- Class JetPlayer.OnJetEventListener -->
+<A HREF="pkg_android.media.html#JetPlayer.OnJetEventListener" class="hiddenlink" target="rightframe"><b><i>JetPlayer.OnJetEventListener</i></b></A><br>
+<!-- Field KEY_LOCATION_CHANGED -->
+<A NAME="K"></A>
+<br><font size="+2">K</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.KEY_LOCATION_CHANGED" class="hiddenlink" target="rightframe">KEY_LOCATION_CHANGED</A>
+</nobr><br>
+<!-- Field KEY_PROVIDER_ENABLED -->
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.KEY_PROVIDER_ENABLED" class="hiddenlink" target="rightframe">KEY_PROVIDER_ENABLED</A>
+</nobr><br>
+<!-- Field KEY_STATUS_CHANGED -->
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.KEY_STATUS_CHANGED" class="hiddenlink" target="rightframe">KEY_STATUS_CHANGED</A>
+</nobr><br>
+<!-- Field keyBackground -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.keyBackground" class="hiddenlink" target="rightframe">keyBackground</A>
+</nobr><br>
+<!-- Field keyboardMode -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.keyboardMode" class="hiddenlink" target="rightframe">keyboardMode</A>
+</nobr><br>
+<!-- Field keyboardView -->
+<nobr><A HREF="android.R.id.html#android.R.id.keyboardView" class="hiddenlink" target="rightframe">keyboardView</A>
+</nobr><br>
+<!-- Field KEYCODE_MEDIA_FAST_FORWARD -->
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.KEYCODE_MEDIA_FAST_FORWARD" class="hiddenlink" target="rightframe">KEYCODE_MEDIA_FAST_FORWARD</A>
+</nobr><br>
+<!-- Field KEYCODE_MEDIA_NEXT -->
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.KEYCODE_MEDIA_NEXT" class="hiddenlink" target="rightframe">KEYCODE_MEDIA_NEXT</A>
+</nobr><br>
+<!-- Field KEYCODE_MEDIA_PLAY_PAUSE -->
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE" class="hiddenlink" target="rightframe">KEYCODE_MEDIA_PLAY_PAUSE</A>
+</nobr><br>
+<!-- Field KEYCODE_MEDIA_PREVIOUS -->
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.KEYCODE_MEDIA_PREVIOUS" class="hiddenlink" target="rightframe">KEYCODE_MEDIA_PREVIOUS</A>
+</nobr><br>
+<!-- Field KEYCODE_MEDIA_REWIND -->
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.KEYCODE_MEDIA_REWIND" class="hiddenlink" target="rightframe">KEYCODE_MEDIA_REWIND</A>
+</nobr><br>
+<!-- Field KEYCODE_MEDIA_STOP -->
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.KEYCODE_MEDIA_STOP" class="hiddenlink" target="rightframe">KEYCODE_MEDIA_STOP</A>
+</nobr><br>
+<!-- Field KEYCODE_MUTE -->
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.KEYCODE_MUTE" class="hiddenlink" target="rightframe">KEYCODE_MUTE</A>
+</nobr><br>
+<!-- Field keyEdgeFlags -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.keyEdgeFlags" class="hiddenlink" target="rightframe">keyEdgeFlags</A>
+</nobr><br>
+<!-- Constructor KeyEvent -->
+<i>KeyEvent</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.ctor_added(android.view.KeyEvent)" class="hiddenlink" target="rightframe"><b>KeyEvent</b>
+(<code>KeyEvent</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Constructor KeyEvent -->
+&nbsp;&nbsp;<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.ctor_added(long, java.lang.String, int, int)" class="hiddenlink" target="rightframe"><b>KeyEvent</b>
+(<code>long, String, int, int</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Field keyHeight -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.keyHeight" class="hiddenlink" target="rightframe">keyHeight</A>
+</nobr><br>
+<!-- Field keyIcon -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.keyIcon" class="hiddenlink" target="rightframe">keyIcon</A>
+</nobr><br>
+<!-- Field keyLabel -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.keyLabel" class="hiddenlink" target="rightframe">keyLabel</A>
+</nobr><br>
+<!-- Field keyOutputText -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.keyOutputText" class="hiddenlink" target="rightframe">keyOutputText</A>
+</nobr><br>
+<!-- Field keyPreviewHeight -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.keyPreviewHeight" class="hiddenlink" target="rightframe">keyPreviewHeight</A>
+</nobr><br>
+<!-- Field keyPreviewLayout -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.keyPreviewLayout" class="hiddenlink" target="rightframe">keyPreviewLayout</A>
+</nobr><br>
+<!-- Field keyPreviewOffset -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.keyPreviewOffset" class="hiddenlink" target="rightframe">keyPreviewOffset</A>
+</nobr><br>
+<!-- Field keyTextColor -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.keyTextColor" class="hiddenlink" target="rightframe">keyTextColor</A>
+</nobr><br>
+<!-- Field keyTextSize -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.keyTextSize" class="hiddenlink" target="rightframe">keyTextSize</A>
+</nobr><br>
+<!-- Field keyWidth -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.keyWidth" class="hiddenlink" target="rightframe">keyWidth</A>
+</nobr><br>
+<!-- Field labelTextSize -->
+<A NAME="L"></A>
+<br><font size="+2">L</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.R.attr.html#android.R.attr.labelTextSize" class="hiddenlink" target="rightframe">labelTextSize</A>
+</nobr><br>
+<!-- Method launchActivityWithIntent -->
+<nobr><A HREF="android.test.InstrumentationTestCase.html#android.test.InstrumentationTestCase.launchActivityWithIntent_added(java.lang.String, java.lang.Class<T>, android.content.Intent)" class="hiddenlink" target="rightframe"><b>launchActivityWithIntent</b>
+(<code>String, Class&lt;T&gt;, Intent</code>)</A></nobr><br>
+<!-- Class LauncherActivity.IconResizer -->
+<A HREF="pkg_android.app.html#LauncherActivity.IconResizer" class="hiddenlink" target="rightframe"><b>LauncherActivity.IconResizer</b></A><br>
+<!-- Class LauncherActivity.ListItem -->
+<A HREF="pkg_android.app.html#LauncherActivity.ListItem" class="hiddenlink" target="rightframe"><b>LauncherActivity.ListItem</b></A><br>
+<!-- Constructor LeadingMarginSpan.Standard -->
+<nobr><A HREF="android.text.style.LeadingMarginSpan.Standard.html#android.text.style.LeadingMarginSpan.Standard.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>LeadingMarginSpan.Standard</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Class LiveFolders -->
+<A HREF="pkg_android.provider.html#LiveFolders" class="hiddenlink" target="rightframe"><b>LiveFolders</b></A><br>
+<!-- Method load -->
+<i>load</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.media.SoundPool.html#android.media.SoundPool.load_added(android.content.res.AssetFileDescriptor, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>AssetFileDescriptor, int</code>)</b>&nbsp;in&nbsp;android.media.SoundPool
+</A></nobr><br>
+<!-- Method load -->
+&nbsp;&nbsp;<nobr><A HREF="android.media.SoundPool.html#android.media.SoundPool.load_added(java.io.FileDescriptor, long, long, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>FileDescriptor, long, long, int</code>)</b>&nbsp;in&nbsp;android.media.SoundPool
+</A></nobr><br>
+<!-- Method loadDex -->
+<nobr><A HREF="dalvik.system.DexFile.html#dalvik.system.DexFile.loadDex_added(java.lang.String, java.lang.String, int)" class="hiddenlink" target="rightframe"><b>loadDex</b>
+(<code>String, String, int</code>)</A></nobr><br>
+<!-- Field LOCK_PATTERN_TACTILE_FEEDBACK_ENABLED -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.LOCK_PATTERN_TACTILE_FEEDBACK_ENABLED" class="hiddenlink" target="rightframe">LOCK_PATTERN_TACTILE_FEEDBACK_ENABLED</A>
+</nobr><br>
+<!-- Method longClickView -->
+<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.longClickView_added(android.test.InstrumentationTestCase, android.view.View)" class="hiddenlink" target="rightframe"><b>longClickView</b>
+(<code>InstrumentationTestCase, View</code>)</A></nobr><br>
+<!-- Method makeListItems -->
+<A NAME="M"></A>
+<br><font size="+2">M</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.app.LauncherActivity.html#android.app.LauncherActivity.makeListItems_added()" class="hiddenlink" target="rightframe"><b>makeListItems</b>
+()</A></nobr><br>
+<!-- Method mayUseInputMethod -->
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.mayUseInputMethod_added(int)" class="hiddenlink" target="rightframe"><b>mayUseInputMethod</b>
+(<code>int</code>)</A></nobr><br>
+<!-- Field MEDIA_CHECKING -->
+<nobr><A HREF="android.os.Environment.html#android.os.Environment.MEDIA_CHECKING" class="hiddenlink" target="rightframe">MEDIA_CHECKING</A>
+</nobr><br>
+<!-- Field MEDIA_ERROR_NOT_VALID_FOR_PROGRESSIVE_PLAYBACK -->
+<nobr><A HREF="android.media.MediaPlayer.html#android.media.MediaPlayer.MEDIA_ERROR_NOT_VALID_FOR_PROGRESSIVE_PLAYBACK" class="hiddenlink" target="rightframe">MEDIA_ERROR_NOT_VALID_FOR_PROGRESSIVE_PLAYBACK</A>
+</nobr><br>
+<!-- Field MEDIA_INFO_BAD_INTERLEAVING -->
+<nobr><A HREF="android.media.MediaPlayer.html#android.media.MediaPlayer.MEDIA_INFO_BAD_INTERLEAVING" class="hiddenlink" target="rightframe">MEDIA_INFO_BAD_INTERLEAVING</A>
+</nobr><br>
+<!-- Field MEDIA_INFO_NOT_SEEKABLE -->
+<nobr><A HREF="android.media.MediaPlayer.html#android.media.MediaPlayer.MEDIA_INFO_NOT_SEEKABLE" class="hiddenlink" target="rightframe">MEDIA_INFO_NOT_SEEKABLE</A>
+</nobr><br>
+<!-- Field MEDIA_INFO_UNKNOWN -->
+<nobr><A HREF="android.media.MediaPlayer.html#android.media.MediaPlayer.MEDIA_INFO_UNKNOWN" class="hiddenlink" target="rightframe">MEDIA_INFO_UNKNOWN</A>
+</nobr><br>
+<!-- Field MEDIA_INFO_VIDEO_TRACK_LAGGING -->
+<nobr><A HREF="android.media.MediaPlayer.html#android.media.MediaPlayer.MEDIA_INFO_VIDEO_TRACK_LAGGING" class="hiddenlink" target="rightframe">MEDIA_INFO_VIDEO_TRACK_LAGGING</A>
+</nobr><br>
+<!-- Field MEDIA_NOFS -->
+<nobr><A HREF="android.os.Environment.html#android.os.Environment.MEDIA_NOFS" class="hiddenlink" target="rightframe">MEDIA_NOFS</A>
+</nobr><br>
+<!-- Field MEDIA_RECORDER_ERROR_UNKNOWN -->
+<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.MEDIA_RECORDER_ERROR_UNKNOWN" class="hiddenlink" target="rightframe">MEDIA_RECORDER_ERROR_UNKNOWN</A>
+</nobr><br>
+<!-- Field MEDIA_RECORDER_INFO_MAX_DURATION_REACHED -->
+<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.MEDIA_RECORDER_INFO_MAX_DURATION_REACHED" class="hiddenlink" target="rightframe">MEDIA_RECORDER_INFO_MAX_DURATION_REACHED</A>
+</nobr><br>
+<!-- Field MEDIA_RECORDER_INFO_MAX_FILESIZE_REACHED -->
+<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.MEDIA_RECORDER_INFO_MAX_FILESIZE_REACHED" class="hiddenlink" target="rightframe">MEDIA_RECORDER_INFO_MAX_FILESIZE_REACHED</A>
+</nobr><br>
+<!-- Field MEDIA_RECORDER_INFO_UNKNOWN -->
+<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.MEDIA_RECORDER_INFO_UNKNOWN" class="hiddenlink" target="rightframe">MEDIA_RECORDER_INFO_UNKNOWN</A>
+</nobr><br>
+<!-- Class MediaPlayer.OnInfoListener -->
+<A HREF="pkg_android.media.html#MediaPlayer.OnInfoListener" class="hiddenlink" target="rightframe"><b><i>MediaPlayer.OnInfoListener</i></b></A><br>
+<!-- Class MediaPlayer.OnVideoSizeChangedListener -->
+<A HREF="pkg_android.media.html#MediaPlayer.OnVideoSizeChangedListener" class="hiddenlink" target="rightframe"><b><i>MediaPlayer.OnVideoSizeChangedListener</i></b></A><br>
+<!-- Class MediaRecorder.OnErrorListener -->
+<A HREF="pkg_android.media.html#MediaRecorder.OnErrorListener" class="hiddenlink" target="rightframe"><b><i>MediaRecorder.OnErrorListener</i></b></A><br>
+<!-- Class MediaRecorder.OnInfoListener -->
+<A HREF="pkg_android.media.html#MediaRecorder.OnInfoListener" class="hiddenlink" target="rightframe"><b><i>MediaRecorder.OnInfoListener</i></b></A><br>
+<!-- Class MediaRecorder.VideoEncoder -->
+<A HREF="pkg_android.media.html#MediaRecorder.VideoEncoder" class="hiddenlink" target="rightframe"><b>MediaRecorder.VideoEncoder</b></A><br>
+<!-- Class MediaRecorder.VideoSource -->
+<A HREF="pkg_android.media.html#MediaRecorder.VideoSource" class="hiddenlink" target="rightframe"><b>MediaRecorder.VideoSource</b></A><br>
+<!-- Field MODE_APPEND -->
+<nobr><A HREF="android.os.ParcelFileDescriptor.html#android.os.ParcelFileDescriptor.MODE_APPEND" class="hiddenlink" target="rightframe">MODE_APPEND</A>
+</nobr><br>
+<!-- Field MOUNT_FORMAT_FILESYSTEMS -->
+<nobr><A HREF="android.Manifest.permission.html#android.Manifest.permission.MOUNT_FORMAT_FILESYSTEMS" class="hiddenlink" target="rightframe">MOUNT_FORMAT_FILESYSTEMS</A>
+</nobr><br>
+<!-- Method moveCursorToVisibleOffset -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.moveCursorToVisibleOffset_added()" class="hiddenlink" target="rightframe"><b>moveCursorToVisibleOffset</b>
+()</A></nobr><br>
+<!-- Method mutate -->
+<nobr><A HREF="android.graphics.drawable.Drawable.html#android.graphics.drawable.Drawable.mutate_added()" class="hiddenlink" target="rightframe"><b>mutate</b>
+()</A></nobr><br>
+<!-- Field mVerticalAlignment -->
+<nobr><A HREF="android.text.style.DynamicDrawableSpan.html#android.text.style.DynamicDrawableSpan.mVerticalAlignment" class="hiddenlink" target="rightframe">mVerticalAlignment</A>
+</nobr><br>
+<!-- Class NeighboringCellInfo -->
+<A NAME="N"></A>
+<br><font size="+2">N</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="pkg_android.telephony.html#NeighboringCellInfo" class="hiddenlink" target="rightframe"><b>NeighboringCellInfo</b></A><br>
+<!-- Class NoCopySpan -->
+<A HREF="pkg_android.text.html#NoCopySpan" class="hiddenlink" target="rightframe"><b><i>NoCopySpan</i></b></A><br>
+<!-- Class NoCopySpan.Concrete -->
+<A HREF="pkg_android.text.html#NoCopySpan.Concrete" class="hiddenlink" target="rightframe"><b>NoCopySpan.Concrete</b></A><br>
+<!-- Field noHistory -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.noHistory" class="hiddenlink" target="rightframe">noHistory</A>
+</nobr><br>
+<!-- Field NUMBER_OF_SONGS_FOR_ARTIST -->
+<nobr><A HREF="android.provider.MediaStore.Audio.AlbumColumns.html#android.provider.MediaStore.Audio.AlbumColumns.NUMBER_OF_SONGS_FOR_ARTIST" class="hiddenlink" target="rightframe">NUMBER_OF_SONGS_FOR_ARTIST</A>
+</nobr><br>
+<!-- Method onBeginBatchEdit -->
+<A NAME="O"></A>
+<br><font size="+2">O</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.onBeginBatchEdit_added()" class="hiddenlink" target="rightframe"><b>onBeginBatchEdit</b>
+()</A></nobr><br>
+<!-- Method onCheckIsTextEditor -->
+<nobr><A HREF="android.view.View.html#android.view.View.onCheckIsTextEditor_added()" class="hiddenlink" target="rightframe"><b>onCheckIsTextEditor</b>
+()</A></nobr><br>
+<!-- Method onCommitCompletion -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.onCommitCompletion_added(android.view.inputmethod.CompletionInfo)" class="hiddenlink" target="rightframe"><b>onCommitCompletion</b>
+(<code>CompletionInfo</code>)</A></nobr><br>
+<!-- Method onContentChanged -->
+<nobr><A HREF="android.widget.CursorAdapter.html#android.widget.CursorAdapter.onContentChanged_added()" class="hiddenlink" target="rightframe"><b>onContentChanged</b>
+()</A></nobr><br>
+<!-- Method onCreateInputConnection -->
+<nobr><A HREF="android.view.View.html#android.view.View.onCreateInputConnection_added(android.view.inputmethod.EditorInfo)" class="hiddenlink" target="rightframe"><b>onCreateInputConnection</b>
+(<code>EditorInfo</code>)</A></nobr><br>
+<!-- Method onDoubleTap -->
+<nobr><A HREF="android.view.GestureDetector.SimpleOnGestureListener.html#android.view.GestureDetector.SimpleOnGestureListener.onDoubleTap_added(android.view.MotionEvent)" class="hiddenlink" target="rightframe"><b>onDoubleTap</b>
+(<code>MotionEvent</code>)</A></nobr><br>
+<!-- Method onDoubleTapEvent -->
+<nobr><A HREF="android.view.GestureDetector.SimpleOnGestureListener.html#android.view.GestureDetector.SimpleOnGestureListener.onDoubleTapEvent_added(android.view.MotionEvent)" class="hiddenlink" target="rightframe"><b>onDoubleTapEvent</b>
+(<code>MotionEvent</code>)</A></nobr><br>
+<!-- Method onEditorAction -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.onEditorAction_added(int)" class="hiddenlink" target="rightframe"><b>onEditorAction</b>
+(<code>int</code>)</A></nobr><br>
+<!-- Method onEndBatchEdit -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.onEndBatchEdit_added()" class="hiddenlink" target="rightframe"><b>onEndBatchEdit</b>
+()</A></nobr><br>
+<!-- Method onFinishTemporaryDetach -->
+<nobr><A HREF="android.view.View.html#android.view.View.onFinishTemporaryDetach_added()" class="hiddenlink" target="rightframe"><b>onFinishTemporaryDetach</b>
+()</A></nobr><br>
+<!-- Method onKeyOther -->
+<i>onKeyOther</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.ArrowKeyMovementMethod.html#android.text.method.ArrowKeyMovementMethod.onKeyOther_added(android.widget.TextView, android.text.Spannable, android.view.KeyEvent)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>TextView, Spannable, KeyEvent</code>)</b>&nbsp;in&nbsp;android.text.method.ArrowKeyMovementMethod
+</A></nobr><br>
+<!-- Method onKeyOther -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.BaseKeyListener.html#android.text.method.BaseKeyListener.onKeyOther_added(android.view.View, android.text.Editable, android.view.KeyEvent)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>View, Editable, KeyEvent</code>)</b>&nbsp;in&nbsp;android.text.method.BaseKeyListener
+</A></nobr><br>
+<!-- Method onKeyOther -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.KeyListener.html#android.text.method.KeyListener.onKeyOther_added(android.view.View, android.text.Editable, android.view.KeyEvent)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>View, Editable, KeyEvent</code>)</b>&nbsp;in&nbsp;android.text.method.KeyListener
+</A></nobr><br>
+<!-- Method onKeyOther -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.MovementMethod.html#android.text.method.MovementMethod.onKeyOther_added(android.widget.TextView, android.text.Spannable, android.view.KeyEvent)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>TextView, Spannable, KeyEvent</code>)</b>&nbsp;in&nbsp;android.text.method.MovementMethod
+</A></nobr><br>
+<!-- Method onKeyOther -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.ScrollingMovementMethod.html#android.text.method.ScrollingMovementMethod.onKeyOther_added(android.widget.TextView, android.text.Spannable, android.view.KeyEvent)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>TextView, Spannable, KeyEvent</code>)</b>&nbsp;in&nbsp;android.text.method.ScrollingMovementMethod
+</A></nobr><br>
+<!-- Method onKeyPreIme -->
+<nobr><A HREF="android.view.View.html#android.view.View.onKeyPreIme_added(int, android.view.KeyEvent)" class="hiddenlink" target="rightframe"><b>onKeyPreIme</b>
+(<code>int, KeyEvent</code>)</A></nobr><br>
+<!-- Method onPrivateIMECommand -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.onPrivateIMECommand_added(java.lang.String, android.os.Bundle)" class="hiddenlink" target="rightframe"><b>onPrivateIMECommand</b>
+(<code>String, Bundle</code>)</A></nobr><br>
+<!-- Method onSelectionChanged -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.onSelectionChanged_added(int, int)" class="hiddenlink" target="rightframe"><b>onSelectionChanged</b>
+(<code>int, int</code>)</A></nobr><br>
+<!-- Method onSingleTapConfirmed -->
+<nobr><A HREF="android.view.GestureDetector.SimpleOnGestureListener.html#android.view.GestureDetector.SimpleOnGestureListener.onSingleTapConfirmed_added(android.view.MotionEvent)" class="hiddenlink" target="rightframe"><b>onSingleTapConfirmed</b>
+(<code>MotionEvent</code>)</A></nobr><br>
+<!-- Method onStartTemporaryDetach -->
+<nobr><A HREF="android.view.View.html#android.view.View.onStartTemporaryDetach_added()" class="hiddenlink" target="rightframe"><b>onStartTemporaryDetach</b>
+()</A></nobr><br>
+<!-- Method onTextContextMenuItem -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.onTextContextMenuItem_added(int)" class="hiddenlink" target="rightframe"><b>onTextContextMenuItem</b>
+(<code>int</code>)</A></nobr><br>
+<!-- Method onUserInteraction -->
+<nobr><A HREF="android.app.Activity.html#android.app.Activity.onUserInteraction_added()" class="hiddenlink" target="rightframe"><b>onUserInteraction</b>
+()</A></nobr><br>
+<!-- Method onUserLeaveHint -->
+<nobr><A HREF="android.app.Activity.html#android.app.Activity.onUserLeaveHint_added()" class="hiddenlink" target="rightframe"><b>onUserLeaveHint</b>
+()</A></nobr><br>
+<!-- Method openAssetFile -->
+<nobr><A HREF="android.content.ContentProvider.html#android.content.ContentProvider.openAssetFile_added(android.net.Uri, java.lang.String)" class="hiddenlink" target="rightframe"><b>openAssetFile</b>
+(<code>Uri, String</code>)</A></nobr><br>
+<!-- Method openAssetFileDescriptor -->
+<nobr><A HREF="android.content.ContentResolver.html#android.content.ContentResolver.openAssetFileDescriptor_added(android.net.Uri, java.lang.String)" class="hiddenlink" target="rightframe"><b>openAssetFileDescriptor</b>
+(<code>Uri, String</code>)</A></nobr><br>
+<!-- Method openOutputStream -->
+<nobr><A HREF="android.content.ContentResolver.html#android.content.ContentResolver.openOutputStream_added(android.net.Uri, java.lang.String)" class="hiddenlink" target="rightframe"><b>openOutputStream</b>
+(<code>Uri, String</code>)</A></nobr><br>
+<!-- Method openRawResource -->
+<nobr><A HREF="android.content.res.Resources.html#android.content.res.Resources.openRawResource_added(int, android.util.TypedValue)" class="hiddenlink" target="rightframe"><b>openRawResource</b>
+(<code>int, TypedValue</code>)</A></nobr><br>
+<!-- Class OrientationEventListener -->
+<A HREF="pkg_android.view.html#OrientationEventListener" class="hiddenlink" target="rightframe"><b>OrientationEventListener</b></A><br>
+<!-- Constructor OrientationListener -->
+<nobr><A HREF="android.view.OrientationListener.html#android.view.OrientationListener.ctor_added(android.content.Context, int)" class="hiddenlink" target="rightframe"><b>OrientationListener</b>
+(<code>Context, int</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Class ParcelableSpan -->
+<A NAME="P"></A>
+<br><font size="+2">P</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="pkg_android.text.html#ParcelableSpan" class="hiddenlink" target="rightframe"><b><i>ParcelableSpan</i></b></A><br>
+<!-- Method parseBundleExtra -->
+<nobr><A HREF="android.content.res.Resources.html#android.content.res.Resources.parseBundleExtra_added(java.lang.String, android.util.AttributeSet, android.os.Bundle)" class="hiddenlink" target="rightframe"><b>parseBundleExtra</b>
+(<code>String, AttributeSet, Bundle</code>)</A></nobr><br>
+<!-- Method parseBundleExtras -->
+<nobr><A HREF="android.content.res.Resources.html#android.content.res.Resources.parseBundleExtras_added(android.content.res.XmlResourceParser, android.os.Bundle)" class="hiddenlink" target="rightframe"><b>parseBundleExtras</b>
+(<code>XmlResourceParser, Bundle</code>)</A></nobr><br>
+<!-- Field paste -->
+<nobr><A HREF="android.R.id.html#android.R.id.paste" class="hiddenlink" target="rightframe">paste</A>
+</nobr><br>
+<!-- Method peekService -->
+<nobr><A HREF="android.content.BroadcastReceiver.html#android.content.BroadcastReceiver.peekService_added(android.content.Context, android.content.Intent)" class="hiddenlink" target="rightframe"><b>peekService</b>
+(<code>Context, Intent</code>)</A></nobr><br>
+<!-- Method performHapticFeedback -->
+<i>performHapticFeedback</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.view.View.html#android.view.View.performHapticFeedback_added(int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>int</code>)</b>&nbsp;in&nbsp;android.view.View
+</A></nobr><br>
+<!-- Method performHapticFeedback -->
+&nbsp;&nbsp;<nobr><A HREF="android.view.View.html#android.view.View.performHapticFeedback_added(int, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>int, int</code>)</b>&nbsp;in&nbsp;android.view.View
+</A></nobr><br>
+<!-- Field PHONETIC_NAME -->
+<i>PHONETIC_NAME</i><br>
+&nbsp;in&nbsp;
+<nobr><A HREF="android.provider.Contacts.Intents.Insert.html#android.provider.Contacts.Intents.Insert.PHONETIC_NAME" class="hiddenlink" target="rightframe">android.provider.Contacts.Intents.Insert</A>
+</nobr><br>
+<!-- Field PHONETIC_NAME -->
+&nbsp;in&nbsp;
+<nobr><A HREF="android.provider.Contacts.PeopleColumns.html#android.provider.Contacts.PeopleColumns.PHONETIC_NAME" class="hiddenlink" target="rightframe">android.provider.Contacts.PeopleColumns</A>
+</nobr><br>
+<!-- Method playSoundEffect -->
+<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.playSoundEffect_added(int, float)" class="hiddenlink" target="rightframe"><b>playSoundEffect</b>
+(<code>int, float</code>)</A></nobr><br>
+<!-- Class PluginData -->
+<A HREF="pkg_android.webkit.html#PluginData" class="hiddenlink" target="rightframe"><b>PluginData</b></A><br>
+<!-- Field popupCharacters -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.popupCharacters" class="hiddenlink" target="rightframe">popupCharacters</A>
+</nobr><br>
+<!-- Field popupKeyboard -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.popupKeyboard" class="hiddenlink" target="rightframe">popupKeyboard</A>
+</nobr><br>
+<!-- Field popupLayout -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.popupLayout" class="hiddenlink" target="rightframe">popupLayout</A>
+</nobr><br>
+<!-- Class PrintStreamPrinter -->
+<A HREF="pkg_android.util.html#PrintStreamPrinter" class="hiddenlink" target="rightframe"><b>PrintStreamPrinter</b></A><br>
+<!-- Field privateImeOptions -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.privateImeOptions" class="hiddenlink" target="rightframe">privateImeOptions</A>
+</nobr><br>
+<!-- Class ProviderTestCase2 -->
+<A HREF="pkg_android.test.html#ProviderTestCase2" class="hiddenlink" target="rightframe"><b>ProviderTestCase2</b></A><br>
+<!-- Method putLong -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.putLong_added(android.content.ContentResolver, java.lang.String, long)" class="hiddenlink" target="rightframe"><b>putLong</b>
+(<code>ContentResolver, String, long</code>)</A></nobr><br>
+<!-- Constructor QuoteSpan -->
+<A NAME="Q"></A>
+<br><font size="+2">Q</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.text.style.QuoteSpan.html#android.text.style.QuoteSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>QuoteSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Class R.bool -->
+<A NAME="R"></A>
+<br><font size="+2">R</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="pkg_android.html#R.bool" class="hiddenlink" target="rightframe"><b>R.bool</b></A><br>
+<!-- Class R.integer -->
+<A HREF="pkg_android.html#R.integer" class="hiddenlink" target="rightframe"><b>R.integer</b></A><br>
+<!-- Field RAW_AMR -->
+<nobr><A HREF="android.media.MediaRecorder.OutputFormat.html#android.media.MediaRecorder.OutputFormat.RAW_AMR" class="hiddenlink" target="rightframe">RAW_AMR</A>
+</nobr><br>
+<!-- Method readFromParcel -->
+<nobr><A HREF="android.graphics.RectF.html#android.graphics.RectF.readFromParcel_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>readFromParcel</b>
+(<code>Parcel</code>)</A></nobr><br>
+<!-- Method registerListener -->
+<i>registerListener</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.registerListener_added(android.hardware.SensorEventListener, android.hardware.Sensor, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>SensorEventListener, Sensor, int</code>)</b>&nbsp;in&nbsp;android.hardware.SensorManager
+</A></nobr><br>
+<!-- Method registerListener -->
+&nbsp;&nbsp;<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.registerListener_added(android.hardware.SensorEventListener, android.hardware.Sensor, int, android.os.Handler)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>SensorEventListener, Sensor, int, Handler</code>)</b>&nbsp;in&nbsp;android.hardware.SensorManager
+</A></nobr><br>
+<!-- Constructor RelativeSizeSpan -->
+<nobr><A HREF="android.text.style.RelativeSizeSpan.html#android.text.style.RelativeSizeSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>RelativeSizeSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Method remapCoordinateSystem -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.remapCoordinateSystem_added(float[], int, int, float[])" class="hiddenlink" target="rightframe"><b>remapCoordinateSystem</b>
+(<code>float[], int, int, float[]</code>)</A></nobr><br>
+<!-- Constructor RemoteViews.ActionException -->
+<nobr><A HREF="android.widget.RemoteViews.ActionException.html#android.widget.RemoteViews.ActionException.ctor_added(java.lang.Exception)" class="hiddenlink" target="rightframe"><b>RemoteViews.ActionException</b>
+(<code>Exception</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Method removeAt -->
+<nobr><A HREF="android.util.SparseIntArray.html#android.util.SparseIntArray.removeAt_added(int)" class="hiddenlink" target="rightframe"><b>removeAt</b>
+(<code>int</code>)</A></nobr><br>
+<!-- Method removeGpsStatusListener -->
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.removeGpsStatusListener_added(android.location.GpsStatus.Listener)" class="hiddenlink" target="rightframe"><b>removeGpsStatusListener</b>
+(<code>Listener</code>)</A></nobr><br>
+<!-- Method removeOnScrollChangedListener -->
+<nobr><A HREF="android.view.ViewTreeObserver.html#android.view.ViewTreeObserver.removeOnScrollChangedListener_added(android.view.ViewTreeObserver.OnScrollChangedListener)" class="hiddenlink" target="rightframe"><b>removeOnScrollChangedListener</b>
+(<code>OnScrollChangedListener</code>)</A></nobr><br>
+<!-- Method removePropertyChangeListener -->
+<i>removePropertyChangeListener</i><br>
+&nbsp;&nbsp;<nobr><A HREF="java.util.jar.Pack200.Packer.html#java.util.jar.Pack200.Packer.removePropertyChangeListener_added(java.beans.PropertyChangeListener)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>PropertyChangeListener</code>)</b>&nbsp;in&nbsp;java.util.jar.Pack200.Packer
+</A></nobr><br>
+<!-- Method removePropertyChangeListener -->
+&nbsp;&nbsp;<nobr><A HREF="java.util.jar.Pack200.Unpacker.html#java.util.jar.Pack200.Unpacker.removePropertyChangeListener_added(java.beans.PropertyChangeListener)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>PropertyChangeListener</code>)</b>&nbsp;in&nbsp;java.util.jar.Pack200.Unpacker
+</A></nobr><br>
+<!-- Method removePropertyChangeListener -->
+&nbsp;&nbsp;<nobr><A HREF="java.util.logging.LogManager.html#java.util.logging.LogManager.removePropertyChangeListener_added(java.beans.PropertyChangeListener)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>PropertyChangeListener</code>)</b>&nbsp;in&nbsp;java.util.logging.LogManager
+</A></nobr><br>
+<!-- Method removeTestProvider -->
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.removeTestProvider_added(java.lang.String)" class="hiddenlink" target="rightframe"><b>removeTestProvider</b>
+(<code>String</code>)</A></nobr><br>
+<!-- Method removeUpdates -->
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.removeUpdates_added(android.app.PendingIntent)" class="hiddenlink" target="rightframe"><b>removeUpdates</b>
+(<code>PendingIntent</code>)</A></nobr><br>
+<!-- Method replaceExtras -->
+<i>replaceExtras</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.content.Intent.html#android.content.Intent.replaceExtras_added(android.content.Intent)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Intent</code>)</b>&nbsp;in&nbsp;android.content.Intent
+</A></nobr><br>
+<!-- Method replaceExtras -->
+&nbsp;&nbsp;<nobr><A HREF="android.content.Intent.html#android.content.Intent.replaceExtras_added(android.os.Bundle)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Bundle</code>)</b>&nbsp;in&nbsp;android.content.Intent
+</A></nobr><br>
+<!-- Field reqFiveWayNav -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.reqFiveWayNav" class="hiddenlink" target="rightframe">reqFiveWayNav</A>
+</nobr><br>
+<!-- Field reqHardKeyboard -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.reqHardKeyboard" class="hiddenlink" target="rightframe">reqHardKeyboard</A>
+</nobr><br>
+<!-- Field reqKeyboardType -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.reqKeyboardType" class="hiddenlink" target="rightframe">reqKeyboardType</A>
+</nobr><br>
+<!-- Field reqNavigation -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.reqNavigation" class="hiddenlink" target="rightframe">reqNavigation</A>
+</nobr><br>
+<!-- Field reqTouchScreen -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.reqTouchScreen" class="hiddenlink" target="rightframe">reqTouchScreen</A>
+</nobr><br>
+<!-- Method requestChildRectangleOnScreen -->
+<nobr><A HREF="android.view.ViewParent.html#android.view.ViewParent.requestChildRectangleOnScreen_added(android.view.View, android.graphics.Rect, boolean)" class="hiddenlink" target="rightframe"><b>requestChildRectangleOnScreen</b>
+(<code>View, Rect, boolean</code>)</A></nobr><br>
+<!-- Method requestLocationUpdates -->
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.requestLocationUpdates_added(java.lang.String, long, float, android.app.PendingIntent)" class="hiddenlink" target="rightframe"><b>requestLocationUpdates</b>
+(<code>String, long, float, PendingIntent</code>)</A></nobr><br>
+<!-- Method resetLockedMeta -->
+<nobr><A HREF="android.text.method.MetaKeyKeyListener.html#android.text.method.MetaKeyKeyListener.resetLockedMeta_added(long)" class="hiddenlink" target="rightframe"><b>resetLockedMeta</b>
+(<code>long</code>)</A></nobr><br>
+<!-- Constructor ResourceCursorAdapter -->
+<nobr><A HREF="android.widget.ResourceCursorAdapter.html#android.widget.ResourceCursorAdapter.ctor_added(android.content.Context, int, android.database.Cursor, boolean)" class="hiddenlink" target="rightframe"><b>ResourceCursorAdapter</b>
+(<code>Context, int, Cursor, boolean</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Method restartPackage -->
+<nobr><A HREF="android.app.ActivityManager.html#android.app.ActivityManager.restartPackage_added(java.lang.String)" class="hiddenlink" target="rightframe"><b>restartPackage</b>
+(<code>String</code>)</A></nobr><br>
+<!-- Method restorePicture -->
+<nobr><A HREF="android.webkit.WebView.html#android.webkit.WebView.restorePicture_added(android.os.Bundle, java.io.File)" class="hiddenlink" target="rightframe"><b>restorePicture</b>
+(<code>Bundle, File</code>)</A></nobr><br>
+<!-- Class ResultReceiver -->
+<A HREF="pkg_android.os.html#ResultReceiver" class="hiddenlink" target="rightframe"><b>ResultReceiver</b></A><br>
+<!-- Field ROUTE_BLUETOOTH_A2DP -->
+<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.ROUTE_BLUETOOTH_A2DP" class="hiddenlink" target="rightframe">ROUTE_BLUETOOTH_A2DP</A>
+</nobr><br>
+<!-- Field ROUTE_BLUETOOTH_SCO -->
+<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.ROUTE_BLUETOOTH_SCO" class="hiddenlink" target="rightframe">ROUTE_BLUETOOTH_SCO</A>
+</nobr><br>
+<!-- Field rowEdgeFlags -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.rowEdgeFlags" class="hiddenlink" target="rightframe">rowEdgeFlags</A>
+</nobr><br>
+<!-- Method runTestOnUiThread -->
+<nobr><A HREF="android.test.InstrumentationTestCase.html#android.test.InstrumentationTestCase.runTestOnUiThread_added(java.lang.Runnable)" class="hiddenlink" target="rightframe"><b>runTestOnUiThread</b>
+(<code>Runnable</code>)</A></nobr><br>
+<!-- Method savePicture -->
+<A NAME="S"></A>
+<br><font size="+2">S</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.webkit.WebView.html#android.webkit.WebView.savePicture_added(android.os.Bundle, java.io.File)" class="hiddenlink" target="rightframe"><b>savePicture</b>
+(<code>Bundle, File</code>)</A></nobr><br>
+<!-- Constructor ScaleXSpan -->
+<nobr><A HREF="android.text.style.ScaleXSpan.html#android.text.style.ScaleXSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>ScaleXSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Field SCREEN_BRIGHTNESS_CHANGED -->
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SCREEN_BRIGHTNESS_CHANGED" class="hiddenlink" target="rightframe">SCREEN_BRIGHTNESS_CHANGED</A>
+</nobr><br>
+<!-- Field SCREEN_ORIENTATION_CHANGED -->
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SCREEN_ORIENTATION_CHANGED" class="hiddenlink" target="rightframe">SCREEN_ORIENTATION_CHANGED</A>
+</nobr><br>
+<!-- Field screenBrightness -->
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.screenBrightness" class="hiddenlink" target="rightframe">screenBrightness</A>
+</nobr><br>
+<!-- Field screenOrientation -->
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.screenOrientation" class="hiddenlink" target="rightframe">screenOrientation</A>
+</nobr><br>
+<!-- Method scrollToBottom -->
+<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.scrollToBottom_added(android.test.InstrumentationTestCase, android.app.Activity, android.view.ViewGroup)" class="hiddenlink" target="rightframe"><b>scrollToBottom</b>
+(<code>InstrumentationTestCase, Activity, ViewGroup</code>)</A></nobr><br>
+<!-- Method scrollToTop -->
+<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.scrollToTop_added(android.test.InstrumentationTestCase, android.app.Activity, android.view.ViewGroup)" class="hiddenlink" target="rightframe"><b>scrollToTop</b>
+(<code>InstrumentationTestCase, Activity, ViewGroup</code>)</A></nobr><br>
+<!-- Field SECONDARY_EMAIL -->
+<nobr><A HREF="android.provider.Contacts.Intents.Insert.html#android.provider.Contacts.Intents.Insert.SECONDARY_EMAIL" class="hiddenlink" target="rightframe">SECONDARY_EMAIL</A>
+</nobr><br>
+<!-- Field SECONDARY_EMAIL_TYPE -->
+<nobr><A HREF="android.provider.Contacts.Intents.Insert.html#android.provider.Contacts.Intents.Insert.SECONDARY_EMAIL_TYPE" class="hiddenlink" target="rightframe">SECONDARY_EMAIL_TYPE</A>
+</nobr><br>
+<!-- Field SECONDARY_PHONE -->
+<nobr><A HREF="android.provider.Contacts.Intents.Insert.html#android.provider.Contacts.Intents.Insert.SECONDARY_PHONE" class="hiddenlink" target="rightframe">SECONDARY_PHONE</A>
+</nobr><br>
+<!-- Field SECONDARY_PHONE_TYPE -->
+<nobr><A HREF="android.provider.Contacts.Intents.Insert.html#android.provider.Contacts.Intents.Insert.SECONDARY_PHONE_TYPE" class="hiddenlink" target="rightframe">SECONDARY_PHONE_TYPE</A>
+</nobr><br>
+<!-- Class SectionIndexer -->
+<A HREF="pkg_android.widget.html#SectionIndexer" class="hiddenlink" target="rightframe"><b><i>SectionIndexer</i></b></A><br>
+<!-- Field selectAll -->
+<nobr><A HREF="android.R.id.html#android.R.id.selectAll" class="hiddenlink" target="rightframe">selectAll</A>
+</nobr><br>
+<!-- Method sendExtraCommand -->
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.sendExtraCommand_added(java.lang.String, java.lang.String, android.os.Bundle)" class="hiddenlink" target="rightframe"><b>sendExtraCommand</b>
+(<code>String, String, Bundle</code>)</A></nobr><br>
+<!-- Class Sensor -->
+<A HREF="pkg_android.hardware.html#Sensor" class="hiddenlink" target="rightframe"><b>Sensor</b></A><br>
+<!-- Class SensorEvent -->
+<A HREF="pkg_android.hardware.html#SensorEvent" class="hiddenlink" target="rightframe"><b>SensorEvent</b></A><br>
+<!-- Class SensorEventListener -->
+<A HREF="pkg_android.hardware.html#SensorEventListener" class="hiddenlink" target="rightframe"><b><i>SensorEventListener</i></b></A><br>
+<!-- Method setAllowFileAccess -->
+<nobr><A HREF="android.webkit.WebSettings.html#android.webkit.WebSettings.setAllowFileAccess_added(boolean)" class="hiddenlink" target="rightframe"><b>setAllowFileAccess</b>
+(<code>boolean</code>)</A></nobr><br>
+<!-- Method setBitmap -->
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setBitmap_added(int, java.lang.String, android.graphics.Bitmap)" class="hiddenlink" target="rightframe"><b>setBitmap</b>
+(<code>int, String, Bitmap</code>)</A></nobr><br>
+<!-- Method setBluetoothA2dpOn -->
+<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.setBluetoothA2dpOn_added(boolean)" class="hiddenlink" target="rightframe"><b>setBluetoothA2dpOn</b>
+(<code>boolean</code>)</A></nobr><br>
+<!-- Method setBoolean -->
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setBoolean_added(int, java.lang.String, boolean)" class="hiddenlink" target="rightframe"><b>setBoolean</b>
+(<code>int, String, boolean</code>)</A></nobr><br>
+<!-- Method setBuiltInZoomControls -->
+<nobr><A HREF="android.webkit.WebSettings.html#android.webkit.WebSettings.setBuiltInZoomControls_added(boolean)" class="hiddenlink" target="rightframe"><b>setBuiltInZoomControls</b>
+(<code>boolean</code>)</A></nobr><br>
+<!-- Method setButton -->
+<i>setButton</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.app.AlertDialog.html#android.app.AlertDialog.setButton_added(java.lang.CharSequence, android.content.DialogInterface.OnClickListener)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>CharSequence, OnClickListener</code>)</b>&nbsp;in&nbsp;android.app.AlertDialog
+</A></nobr><br>
+<!-- Method setButton -->
+&nbsp;&nbsp;<nobr><A HREF="android.app.AlertDialog.html#android.app.AlertDialog.setButton_added(java.lang.CharSequence, android.os.Message)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>CharSequence, Message</code>)</b>&nbsp;in&nbsp;android.app.AlertDialog
+</A></nobr><br>
+<!-- Method setByte -->
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setByte_added(int, java.lang.String, byte)" class="hiddenlink" target="rightframe"><b>setByte</b>
+(<code>int, String, byte</code>)</A></nobr><br>
+<!-- Method setCamera -->
+<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.setCamera_added(android.hardware.Camera)" class="hiddenlink" target="rightframe"><b>setCamera</b>
+(<code>Camera</code>)</A></nobr><br>
+<!-- Method setChar -->
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setChar_added(int, java.lang.String, char)" class="hiddenlink" target="rightframe"><b>setChar</b>
+(<code>int, String, char</code>)</A></nobr><br>
+<!-- Method setCharSequence -->
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setCharSequence_added(int, java.lang.String, java.lang.CharSequence)" class="hiddenlink" target="rightframe"><b>setCharSequence</b>
+(<code>int, String, CharSequence</code>)</A></nobr><br>
+<!-- Method setClippingEnabled -->
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.setClippingEnabled_added(boolean)" class="hiddenlink" target="rightframe"><b>setClippingEnabled</b>
+(<code>boolean</code>)</A></nobr><br>
+<!-- Method setCompoundDrawablesWithIntrinsicBounds -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.setCompoundDrawablesWithIntrinsicBounds_added(int, int, int, int)" class="hiddenlink" target="rightframe"><b>setCompoundDrawablesWithIntrinsicBounds</b>
+(<code>int, int, int, int</code>)</A></nobr><br>
+<!-- Method setDouble -->
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setDouble_added(int, java.lang.String, double)" class="hiddenlink" target="rightframe"><b>setDouble</b>
+(<code>int, String, double</code>)</A></nobr><br>
+<!-- Method setDropDownAnchor -->
+<nobr><A HREF="android.widget.AutoCompleteTextView.html#android.widget.AutoCompleteTextView.setDropDownAnchor_added(int)" class="hiddenlink" target="rightframe"><b>setDropDownAnchor</b>
+(<code>int</code>)</A></nobr><br>
+<!-- Method setDropDownWidth -->
+<nobr><A HREF="android.widget.AutoCompleteTextView.html#android.widget.AutoCompleteTextView.setDropDownWidth_added(int)" class="hiddenlink" target="rightframe"><b>setDropDownWidth</b>
+(<code>int</code>)</A></nobr><br>
+<!-- Method setExtractedText -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.setExtractedText_added(android.view.inputmethod.ExtractedText)" class="hiddenlink" target="rightframe"><b>setExtractedText</b>
+(<code>ExtractedText</code>)</A></nobr><br>
+<!-- Method setFastScrollEnabled -->
+<nobr><A HREF="android.widget.AbsListView.html#android.widget.AbsListView.setFastScrollEnabled_added(boolean)" class="hiddenlink" target="rightframe"><b>setFastScrollEnabled</b>
+(<code>boolean</code>)</A></nobr><br>
+<!-- Method setFillEnabled -->
+<nobr><A HREF="android.view.animation.Animation.html#android.view.animation.Animation.setFillEnabled_added(boolean)" class="hiddenlink" target="rightframe"><b>setFillEnabled</b>
+(<code>boolean</code>)</A></nobr><br>
+<!-- Method setFloat -->
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setFloat_added(int, java.lang.String, float)" class="hiddenlink" target="rightframe"><b>setFloat</b>
+(<code>int, String, float</code>)</A></nobr><br>
+<!-- Method setFooterDividersEnabled -->
+<nobr><A HREF="android.widget.ListView.html#android.widget.ListView.setFooterDividersEnabled_added(boolean)" class="hiddenlink" target="rightframe"><b>setFooterDividersEnabled</b>
+(<code>boolean</code>)</A></nobr><br>
+<!-- Method setHapticFeedbackEnabled -->
+<nobr><A HREF="android.view.View.html#android.view.View.setHapticFeedbackEnabled_added(boolean)" class="hiddenlink" target="rightframe"><b>setHapticFeedbackEnabled</b>
+(<code>boolean</code>)</A></nobr><br>
+<!-- Method setHeaderDividersEnabled -->
+<nobr><A HREF="android.widget.ListView.html#android.widget.ListView.setHeaderDividersEnabled_added(boolean)" class="hiddenlink" target="rightframe"><b>setHeaderDividersEnabled</b>
+(<code>boolean</code>)</A></nobr><br>
+<!-- Method setImageViewBitmap -->
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setImageViewBitmap_added(int, android.graphics.Bitmap)" class="hiddenlink" target="rightframe"><b>setImageViewBitmap</b>
+(<code>int, Bitmap</code>)</A></nobr><br>
+<!-- Method setImeActionLabel -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.setImeActionLabel_added(java.lang.CharSequence, int)" class="hiddenlink" target="rightframe"><b>setImeActionLabel</b>
+(<code>CharSequence, int</code>)</A></nobr><br>
+<!-- Method setImeOptions -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.setImeOptions_added(int)" class="hiddenlink" target="rightframe"><b>setImeOptions</b>
+(<code>int</code>)</A></nobr><br>
+<!-- Method setInexactRepeating -->
+<nobr><A HREF="android.app.AlarmManager.html#android.app.AlarmManager.setInexactRepeating_added(int, long, long, android.app.PendingIntent)" class="hiddenlink" target="rightframe"><b>setInexactRepeating</b>
+(<code>int, long, long, PendingIntent</code>)</A></nobr><br>
+<!-- Method setInputExtras -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.setInputExtras_added(int)" class="hiddenlink" target="rightframe"><b>setInputExtras</b>
+(<code>int</code>)</A></nobr><br>
+<!-- Method setInputMethodMode -->
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.setInputMethodMode_added(int)" class="hiddenlink" target="rightframe"><b>setInputMethodMode</b>
+(<code>int</code>)</A></nobr><br>
+<!-- Method setInputType -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.setInputType_added(int)" class="hiddenlink" target="rightframe"><b>setInputType</b>
+(<code>int</code>)</A></nobr><br>
+<!-- Method setInt -->
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setInt_added(int, java.lang.String, int)" class="hiddenlink" target="rightframe"><b>setInt</b>
+(<code>int, String, int</code>)</A></nobr><br>
+<!-- Method setKeyProgressIncrement -->
+<nobr><A HREF="android.widget.AbsSeekBar.html#android.widget.AbsSeekBar.setKeyProgressIncrement_added(int)" class="hiddenlink" target="rightframe"><b>setKeyProgressIncrement</b>
+(<code>int</code>)</A></nobr><br>
+<!-- Method setListSelection -->
+<nobr><A HREF="android.widget.AutoCompleteTextView.html#android.widget.AutoCompleteTextView.setListSelection_added(int)" class="hiddenlink" target="rightframe"><b>setListSelection</b>
+(<code>int</code>)</A></nobr><br>
+<!-- Method setLong -->
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setLong_added(int, java.lang.String, long)" class="hiddenlink" target="rightframe"><b>setLong</b>
+(<code>int, String, long</code>)</A></nobr><br>
+<!-- Method setMaxDuration -->
+<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.setMaxDuration_added(int)" class="hiddenlink" target="rightframe"><b>setMaxDuration</b>
+(<code>int</code>)</A></nobr><br>
+<!-- Method setMaxFileSize -->
+<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.setMaxFileSize_added(long)" class="hiddenlink" target="rightframe"><b>setMaxFileSize</b>
+(<code>long</code>)</A></nobr><br>
+<!-- Method setNetworkAvailable -->
+<nobr><A HREF="android.webkit.WebView.html#android.webkit.WebView.setNetworkAvailable_added(boolean)" class="hiddenlink" target="rightframe"><b>setNetworkAvailable</b>
+(<code>boolean</code>)</A></nobr><br>
+<!-- Method setOnChronometerTickListener -->
+<nobr><A HREF="android.widget.Chronometer.html#android.widget.Chronometer.setOnChronometerTickListener_added(android.widget.Chronometer.OnChronometerTickListener)" class="hiddenlink" target="rightframe"><b>setOnChronometerTickListener</b>
+(<code>OnChronometerTickListener</code>)</A></nobr><br>
+<!-- Method setOnClickPendingIntent -->
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setOnClickPendingIntent_added(int, android.app.PendingIntent)" class="hiddenlink" target="rightframe"><b>setOnClickPendingIntent</b>
+(<code>int, PendingIntent</code>)</A></nobr><br>
+<!-- Method setOnDoubleTapListener -->
+<nobr><A HREF="android.view.GestureDetector.html#android.view.GestureDetector.setOnDoubleTapListener_added(android.view.GestureDetector.OnDoubleTapListener)" class="hiddenlink" target="rightframe"><b>setOnDoubleTapListener</b>
+(<code>OnDoubleTapListener</code>)</A></nobr><br>
+<!-- Method setOnEditorActionListener -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.setOnEditorActionListener_added(android.widget.TextView.OnEditorActionListener)" class="hiddenlink" target="rightframe"><b>setOnEditorActionListener</b>
+(<code>OnEditorActionListener</code>)</A></nobr><br>
+<!-- Method setOnErrorListener -->
+<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.setOnErrorListener_added(android.media.MediaRecorder.OnErrorListener)" class="hiddenlink" target="rightframe"><b>setOnErrorListener</b>
+(<code>OnErrorListener</code>)</A></nobr><br>
+<!-- Method setOneShotPreviewCallback -->
+<nobr><A HREF="android.hardware.Camera.html#android.hardware.Camera.setOneShotPreviewCallback_added(android.hardware.Camera.PreviewCallback)" class="hiddenlink" target="rightframe"><b>setOneShotPreviewCallback</b>
+(<code>PreviewCallback</code>)</A></nobr><br>
+<!-- Method setOnInfoListener -->
+<i>setOnInfoListener</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.media.MediaPlayer.html#android.media.MediaPlayer.setOnInfoListener_added(android.media.MediaPlayer.OnInfoListener)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>OnInfoListener</code>)</b>&nbsp;in&nbsp;android.media.MediaPlayer
+</A></nobr><br>
+<!-- Method setOnInfoListener -->
+&nbsp;&nbsp;<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.setOnInfoListener_added(android.media.MediaRecorder.OnInfoListener)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>OnInfoListener</code>)</b>&nbsp;in&nbsp;android.media.MediaRecorder
+</A></nobr><br>
+<!-- Method setOnVideoSizeChangedListener -->
+<nobr><A HREF="android.media.MediaPlayer.html#android.media.MediaPlayer.setOnVideoSizeChangedListener_added(android.media.MediaPlayer.OnVideoSizeChangedListener)" class="hiddenlink" target="rightframe"><b>setOnVideoSizeChangedListener</b>
+(<code>OnVideoSizeChangedListener</code>)</A></nobr><br>
+<!-- Method setOutputFile -->
+<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.setOutputFile_added(java.io.FileDescriptor)" class="hiddenlink" target="rightframe"><b>setOutputFile</b>
+(<code>FileDescriptor</code>)</A></nobr><br>
+<!-- Method setOutsideTouchable -->
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.setOutsideTouchable_added(boolean)" class="hiddenlink" target="rightframe"><b>setOutsideTouchable</b>
+(<code>boolean</code>)</A></nobr><br>
+<!-- Method setPrivateImeOptions -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.setPrivateImeOptions_added(java.lang.String)" class="hiddenlink" target="rightframe"><b>setPrivateImeOptions</b>
+(<code>String</code>)</A></nobr><br>
+<!-- Method setRawInputType -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.setRawInputType_added(int)" class="hiddenlink" target="rightframe"><b>setRawInputType</b>
+(<code>int</code>)</A></nobr><br>
+<!-- Method setScrollContainer -->
+<nobr><A HREF="android.view.View.html#android.view.View.setScrollContainer_added(boolean)" class="hiddenlink" target="rightframe"><b>setScrollContainer</b>
+(<code>boolean</code>)</A></nobr><br>
+<!-- Method setShort -->
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setShort_added(int, java.lang.String, short)" class="hiddenlink" target="rightframe"><b>setShort</b>
+(<code>int, String, short</code>)</A></nobr><br>
+<!-- Method setSmoothScrollbarEnabled -->
+<nobr><A HREF="android.widget.AbsListView.html#android.widget.AbsListView.setSmoothScrollbarEnabled_added(boolean)" class="hiddenlink" target="rightframe"><b>setSmoothScrollbarEnabled</b>
+(<code>boolean</code>)</A></nobr><br>
+<!-- Method setSoftInputMode -->
+<nobr><A HREF="android.view.Window.html#android.view.Window.setSoftInputMode_added(int)" class="hiddenlink" target="rightframe"><b>setSoftInputMode</b>
+(<code>int</code>)</A></nobr><br>
+<!-- Method setStaticTransformationsEnabled -->
+<nobr><A HREF="android.view.ViewGroup.html#android.view.ViewGroup.setStaticTransformationsEnabled_added(boolean)" class="hiddenlink" target="rightframe"><b>setStaticTransformationsEnabled</b>
+(<code>boolean</code>)</A></nobr><br>
+<!-- Method setString -->
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setString_added(int, java.lang.String, java.lang.String)" class="hiddenlink" target="rightframe"><b>setString</b>
+(<code>int, String, String</code>)</A></nobr><br>
+<!-- Method setTestProviderEnabled -->
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.setTestProviderEnabled_added(java.lang.String, boolean)" class="hiddenlink" target="rightframe"><b>setTestProviderEnabled</b>
+(<code>String, boolean</code>)</A></nobr><br>
+<!-- Method setTestProviderLocation -->
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.setTestProviderLocation_added(java.lang.String, android.location.Location)" class="hiddenlink" target="rightframe"><b>setTestProviderLocation</b>
+(<code>String, Location</code>)</A></nobr><br>
+<!-- Method setTestProviderStatus -->
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.setTestProviderStatus_added(java.lang.String, int, android.os.Bundle, long)" class="hiddenlink" target="rightframe"><b>setTestProviderStatus</b>
+(<code>String, int, Bundle, long</code>)</A></nobr><br>
+<!-- Method setTextColor -->
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setTextColor_added(int, int)" class="hiddenlink" target="rightframe"><b>setTextColor</b>
+(<code>int, int</code>)</A></nobr><br>
+<!-- Class Settings.Secure -->
+<A HREF="pkg_android.provider.html#Settings.Secure" class="hiddenlink" target="rightframe"><b>Settings.Secure</b></A><br>
+<!-- Field settingsActivity -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.settingsActivity" class="hiddenlink" target="rightframe">settingsActivity</A>
+</nobr><br>
+<!-- Method setTouchable -->
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.setTouchable_added(boolean)" class="hiddenlink" target="rightframe"><b>setTouchable</b>
+(<code>boolean</code>)</A></nobr><br>
+<!-- Method setTouchInterceptor -->
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.setTouchInterceptor_added(android.view.View.OnTouchListener)" class="hiddenlink" target="rightframe"><b>setTouchInterceptor</b>
+(<code>OnTouchListener</code>)</A></nobr><br>
+<!-- Method setUri -->
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setUri_added(int, java.lang.String, android.net.Uri)" class="hiddenlink" target="rightframe"><b>setUri</b>
+(<code>int, String, Uri</code>)</A></nobr><br>
+<!-- Method setUserAgentString -->
+<nobr><A HREF="android.webkit.WebSettings.html#android.webkit.WebSettings.setUserAgentString_added(java.lang.String)" class="hiddenlink" target="rightframe"><b>setUserAgentString</b>
+(<code>String</code>)</A></nobr><br>
+<!-- Method setVideoEncoder -->
+<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.setVideoEncoder_added(int)" class="hiddenlink" target="rightframe"><b>setVideoEncoder</b>
+(<code>int</code>)</A></nobr><br>
+<!-- Method setVideoFrameRate -->
+<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.setVideoFrameRate_added(int)" class="hiddenlink" target="rightframe"><b>setVideoFrameRate</b>
+(<code>int</code>)</A></nobr><br>
+<!-- Method setVideoSize -->
+<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.setVideoSize_added(int, int)" class="hiddenlink" target="rightframe"><b>setVideoSize</b>
+(<code>int, int</code>)</A></nobr><br>
+<!-- Method setVideoSource -->
+<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.setVideoSource_added(int)" class="hiddenlink" target="rightframe"><b>setVideoSource</b>
+(<code>int</code>)</A></nobr><br>
+<!-- Method setView -->
+<nobr><A HREF="android.app.AlertDialog.html#android.app.AlertDialog.setView_added(android.view.View, int, int, int, int)" class="hiddenlink" target="rightframe"><b>setView</b>
+(<code>View, int, int, int, int</code>)</A></nobr><br>
+<!-- Method setViewResource -->
+<nobr><A HREF="android.widget.ResourceCursorAdapter.html#android.widget.ResourceCursorAdapter.setViewResource_added(int)" class="hiddenlink" target="rightframe"><b>setViewResource</b>
+(<code>int</code>)</A></nobr><br>
+<!-- Method setVisible -->
+<nobr><A HREF="android.app.Activity.html#android.app.Activity.setVisible_added(boolean)" class="hiddenlink" target="rightframe"><b>setVisible</b>
+(<code>boolean</code>)</A></nobr><br>
+<!-- Method setWindowAnimations -->
+<nobr><A HREF="android.view.Window.html#android.view.Window.setWindowAnimations_added(int)" class="hiddenlink" target="rightframe"><b>setWindowAnimations</b>
+(<code>int</code>)</A></nobr><br>
+<!-- Method setWindowLayoutMode -->
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.setWindowLayoutMode_added(int, int)" class="hiddenlink" target="rightframe"><b>setWindowLayoutMode</b>
+(<code>int, int</code>)</A></nobr><br>
+<!-- Field sharedUserId -->
+<nobr><A HREF="android.content.pm.PackageInfo.html#android.content.pm.PackageInfo.sharedUserId" class="hiddenlink" target="rightframe">sharedUserId</A>
+</nobr><br>
+<!-- Field sharedUserLabel -->
+<i>sharedUserLabel</i><br>
+&nbsp;in&nbsp;
+<nobr><A HREF="android.R.attr.html#android.R.attr.sharedUserLabel" class="hiddenlink" target="rightframe">android.R.attr</A>
+</nobr><br>
+<!-- Field sharedUserLabel -->
+&nbsp;in&nbsp;
+<nobr><A HREF="android.content.pm.PackageInfo.html#android.content.pm.PackageInfo.sharedUserLabel" class="hiddenlink" target="rightframe">android.content.pm.PackageInfo</A>
+</nobr><br>
+<!-- Field SHOW_OR_CREATE_CONTACT -->
+<nobr><A HREF="android.provider.Contacts.Intents.html#android.provider.Contacts.Intents.SHOW_OR_CREATE_CONTACT" class="hiddenlink" target="rightframe">SHOW_OR_CREATE_CONTACT</A>
+</nobr><br>
+<!-- Class SlidingDrawer -->
+<A HREF="pkg_android.widget.html#SlidingDrawer" class="hiddenlink" target="rightframe"><b>SlidingDrawer</b></A><br>
+<!-- Class SlidingDrawer.OnDrawerCloseListener -->
+<A HREF="pkg_android.widget.html#SlidingDrawer.OnDrawerCloseListener" class="hiddenlink" target="rightframe"><b><i>SlidingDrawer.OnDrawerCloseListener</i></b></A><br>
+<!-- Class SlidingDrawer.OnDrawerOpenListener -->
+<A HREF="pkg_android.widget.html#SlidingDrawer.OnDrawerOpenListener" class="hiddenlink" target="rightframe"><b><i>SlidingDrawer.OnDrawerOpenListener</i></b></A><br>
+<!-- Class SlidingDrawer.OnDrawerScrollListener -->
+<A HREF="pkg_android.widget.html#SlidingDrawer.OnDrawerScrollListener" class="hiddenlink" target="rightframe"><b><i>SlidingDrawer.OnDrawerScrollListener</i></b></A><br>
+<!-- Field smoothScrollbar -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.smoothScrollbar" class="hiddenlink" target="rightframe">smoothScrollbar</A>
+</nobr><br>
+<!-- Field SOFT_INPUT_ADJUST_PAN -->
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN" class="hiddenlink" target="rightframe">SOFT_INPUT_ADJUST_PAN</A>
+</nobr><br>
+<!-- Field SOFT_INPUT_ADJUST_RESIZE -->
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE" class="hiddenlink" target="rightframe">SOFT_INPUT_ADJUST_RESIZE</A>
+</nobr><br>
+<!-- Field SOFT_INPUT_ADJUST_UNSPECIFIED -->
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SOFT_INPUT_ADJUST_UNSPECIFIED" class="hiddenlink" target="rightframe">SOFT_INPUT_ADJUST_UNSPECIFIED</A>
+</nobr><br>
+<!-- Field SOFT_INPUT_IS_FORWARD_NAVIGATION -->
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SOFT_INPUT_IS_FORWARD_NAVIGATION" class="hiddenlink" target="rightframe">SOFT_INPUT_IS_FORWARD_NAVIGATION</A>
+</nobr><br>
+<!-- Field SOFT_INPUT_MASK_ADJUST -->
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SOFT_INPUT_MASK_ADJUST" class="hiddenlink" target="rightframe">SOFT_INPUT_MASK_ADJUST</A>
+</nobr><br>
+<!-- Field SOFT_INPUT_MASK_STATE -->
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SOFT_INPUT_MASK_STATE" class="hiddenlink" target="rightframe">SOFT_INPUT_MASK_STATE</A>
+</nobr><br>
+<!-- Field SOFT_INPUT_MODE_CHANGED -->
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SOFT_INPUT_MODE_CHANGED" class="hiddenlink" target="rightframe">SOFT_INPUT_MODE_CHANGED</A>
+</nobr><br>
+<!-- Field SOFT_INPUT_STATE_ALWAYS_HIDDEN -->
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN" class="hiddenlink" target="rightframe">SOFT_INPUT_STATE_ALWAYS_HIDDEN</A>
+</nobr><br>
+<!-- Field SOFT_INPUT_STATE_ALWAYS_VISIBLE -->
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE" class="hiddenlink" target="rightframe">SOFT_INPUT_STATE_ALWAYS_VISIBLE</A>
+</nobr><br>
+<!-- Field SOFT_INPUT_STATE_HIDDEN -->
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN" class="hiddenlink" target="rightframe">SOFT_INPUT_STATE_HIDDEN</A>
+</nobr><br>
+<!-- Field SOFT_INPUT_STATE_UNCHANGED -->
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_UNCHANGED" class="hiddenlink" target="rightframe">SOFT_INPUT_STATE_UNCHANGED</A>
+</nobr><br>
+<!-- Field SOFT_INPUT_STATE_UNSPECIFIED -->
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_UNSPECIFIED" class="hiddenlink" target="rightframe">SOFT_INPUT_STATE_UNSPECIFIED</A>
+</nobr><br>
+<!-- Field SOFT_INPUT_STATE_VISIBLE -->
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE" class="hiddenlink" target="rightframe">SOFT_INPUT_STATE_VISIBLE</A>
+</nobr><br>
+<!-- Field softInputMode -->
+<i>softInputMode</i><br>
+&nbsp;in&nbsp;
+<nobr><A HREF="android.content.pm.ActivityInfo.html#android.content.pm.ActivityInfo.softInputMode" class="hiddenlink" target="rightframe">android.content.pm.ActivityInfo</A>
+</nobr><br>
+<!-- Field softInputMode -->
+&nbsp;in&nbsp;
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.softInputMode" class="hiddenlink" target="rightframe">android.view.WindowManager.LayoutParams</A>
+</nobr><br>
+<!-- Method sort -->
+<nobr><A HREF="android.widget.ArrayAdapter.html#android.widget.ArrayAdapter.sort_added(java.util.Comparator<? super T>)" class="hiddenlink" target="rightframe"><b>sort</b>
+(<code>Comparator&lt;? super T&gt;</code>)</A></nobr><br>
+<!-- Field SPAN_COMPOSING -->
+<nobr><A HREF="android.text.Spanned.html#android.text.Spanned.SPAN_COMPOSING" class="hiddenlink" target="rightframe">SPAN_COMPOSING</A>
+</nobr><br>
+<!-- Field SPAN_INTERMEDIATE -->
+<nobr><A HREF="android.text.Spanned.html#android.text.Spanned.SPAN_INTERMEDIATE" class="hiddenlink" target="rightframe">SPAN_INTERMEDIATE</A>
+</nobr><br>
+<!-- Field SPAN_POINT_MARK_MASK -->
+<nobr><A HREF="android.text.Spanned.html#android.text.Spanned.SPAN_POINT_MARK_MASK" class="hiddenlink" target="rightframe">SPAN_POINT_MARK_MASK</A>
+</nobr><br>
+<!-- Field startSelectingText -->
+<nobr><A HREF="android.R.id.html#android.R.id.startSelectingText" class="hiddenlink" target="rightframe">startSelectingText</A>
+</nobr><br>
+<!-- Field state_long_pressable -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.state_long_pressable" class="hiddenlink" target="rightframe">state_long_pressable</A>
+</nobr><br>
+<!-- Field stopSelectingText -->
+<nobr><A HREF="android.R.id.html#android.R.id.stopSelectingText" class="hiddenlink" target="rightframe">stopSelectingText</A>
+</nobr><br>
+<!-- Field STREAM_NOTIFICATION -->
+<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.STREAM_NOTIFICATION" class="hiddenlink" target="rightframe">STREAM_NOTIFICATION</A>
+</nobr><br>
+<!-- Field STRETCH_SPACING_UNIFORM -->
+<nobr><A HREF="android.widget.GridView.html#android.widget.GridView.STRETCH_SPACING_UNIFORM" class="hiddenlink" target="rightframe">STRETCH_SPACING_UNIFORM</A>
+</nobr><br>
+<!-- Constructor StrikethroughSpan -->
+<nobr><A HREF="android.text.style.StrikethroughSpan.html#android.text.style.StrikethroughSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>StrikethroughSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Constructor StyleSpan -->
+<nobr><A HREF="android.text.style.StyleSpan.html#android.text.style.StyleSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>StyleSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Constructor SubscriptSpan -->
+<nobr><A HREF="android.text.style.SubscriptSpan.html#android.text.style.SubscriptSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>SubscriptSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Constructor SuperscriptSpan -->
+<nobr><A HREF="android.text.style.SuperscriptSpan.html#android.text.style.SuperscriptSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>SuperscriptSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Field switchInputMethod -->
+<nobr><A HREF="android.R.id.html#android.R.id.switchInputMethod" class="hiddenlink" target="rightframe">switchInputMethod</A>
+</nobr><br>
+<!-- Field TERTIARY_EMAIL -->
+<A NAME="T"></A>
+<br><font size="+2">T</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.provider.Contacts.Intents.Insert.html#android.provider.Contacts.Intents.Insert.TERTIARY_EMAIL" class="hiddenlink" target="rightframe">TERTIARY_EMAIL</A>
+</nobr><br>
+<!-- Field TERTIARY_EMAIL_TYPE -->
+<nobr><A HREF="android.provider.Contacts.Intents.Insert.html#android.provider.Contacts.Intents.Insert.TERTIARY_EMAIL_TYPE" class="hiddenlink" target="rightframe">TERTIARY_EMAIL_TYPE</A>
+</nobr><br>
+<!-- Field TERTIARY_PHONE -->
+<nobr><A HREF="android.provider.Contacts.Intents.Insert.html#android.provider.Contacts.Intents.Insert.TERTIARY_PHONE" class="hiddenlink" target="rightframe">TERTIARY_PHONE</A>
+</nobr><br>
+<!-- Field TERTIARY_PHONE_TYPE -->
+<nobr><A HREF="android.provider.Contacts.Intents.Insert.html#android.provider.Contacts.Intents.Insert.TERTIARY_PHONE_TYPE" class="hiddenlink" target="rightframe">TERTIARY_PHONE_TYPE</A>
+</nobr><br>
+<!-- Constructor TestMethod -->
+<i>TestMethod</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.suitebuilder.TestMethod.html#android.test.suitebuilder.TestMethod.ctor_added(java.lang.String, java.lang.Class<? extends junit.framework.TestCase>)" class="hiddenlink" target="rightframe"><b>TestMethod</b>
+(<code>String, Class&lt;TestCase&gt;</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Constructor TestMethod -->
+&nbsp;&nbsp;<nobr><A HREF="android.test.suitebuilder.TestMethod.html#android.test.suitebuilder.TestMethod.ctor_added(junit.framework.TestCase)" class="hiddenlink" target="rightframe"><b>TestMethod</b>
+(<code>TestCase</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Constructor TextAppearanceSpan -->
+<nobr><A HREF="android.text.style.TextAppearanceSpan.html#android.text.style.TextAppearanceSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>TextAppearanceSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Class TextView.OnEditorActionListener -->
+<A HREF="pkg_android.widget.html#TextView.OnEditorActionListener" class="hiddenlink" target="rightframe"><b><i>TextView.OnEditorActionListener</i></b></A><br>
+<!-- Field Theme_InputMethod -->
+<nobr><A HREF="android.R.style.html#android.R.style.Theme_InputMethod" class="hiddenlink" target="rightframe">Theme_InputMethod</A>
+</nobr><br>
+<!-- Field Theme_Light_Panel -->
+<nobr><A HREF="android.R.style.html#android.R.style.Theme_Light_Panel" class="hiddenlink" target="rightframe">Theme_Light_Panel</A>
+</nobr><br>
+<!-- Field Theme_NoDisplay -->
+<nobr><A HREF="android.R.style.html#android.R.style.Theme_NoDisplay" class="hiddenlink" target="rightframe">Theme_NoDisplay</A>
+</nobr><br>
+<!-- Field Theme_Panel -->
+<nobr><A HREF="android.R.style.html#android.R.style.Theme_Panel" class="hiddenlink" target="rightframe">Theme_Panel</A>
+</nobr><br>
+<!-- Field thickness -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.thickness" class="hiddenlink" target="rightframe">thickness</A>
+</nobr><br>
+<!-- Field title_bar_tall -->
+<nobr><A HREF="android.R.drawable.html#android.R.drawable.title_bar_tall" class="hiddenlink" target="rightframe">title_bar_tall</A>
+</nobr><br>
+<!-- Field topOffset -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.topOffset" class="hiddenlink" target="rightframe">topOffset</A>
+</nobr><br>
+<!-- Method toShortString -->
+<i>toShortString</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.graphics.Rect.html#android.graphics.Rect.toShortString_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.graphics.Rect
+</A></nobr><br>
+<!-- Method toShortString -->
+&nbsp;&nbsp;<nobr><A HREF="android.view.animation.Transformation.html#android.view.animation.Transformation.toShortString_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.view.animation.Transformation
+</A></nobr><br>
+<!-- Constructor TransitionDrawable -->
+<nobr><A HREF="android.graphics.drawable.TransitionDrawable.html#android.graphics.drawable.TransitionDrawable.ctor_added(android.graphics.drawable.Drawable[])" class="hiddenlink" target="rightframe"><b>TransitionDrawable</b>
+(<code>Drawable[]</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Field TYPE_APPLICATION_ATTACHED_DIALOG -->
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.TYPE_APPLICATION_ATTACHED_DIALOG" class="hiddenlink" target="rightframe">TYPE_APPLICATION_ATTACHED_DIALOG</A>
+</nobr><br>
+<!-- Field TYPE_INPUT_METHOD -->
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD" class="hiddenlink" target="rightframe">TYPE_INPUT_METHOD</A>
+</nobr><br>
+<!-- Field TYPE_INPUT_METHOD_DIALOG -->
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD_DIALOG" class="hiddenlink" target="rightframe">TYPE_INPUT_METHOD_DIALOG</A>
+</nobr><br>
+<!-- Constructor TypefaceSpan -->
+<nobr><A HREF="android.text.style.TypefaceSpan.html#android.text.style.TypefaceSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>TypefaceSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Constructor UnderlineSpan -->
+<A NAME="U"></A>
+<br><font size="+2">U</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.text.style.UnderlineSpan.html#android.text.style.UnderlineSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>UnderlineSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Field UNKNOWN_LENGTH -->
+<nobr><A HREF="android.content.res.AssetFileDescriptor.html#android.content.res.AssetFileDescriptor.UNKNOWN_LENGTH" class="hiddenlink" target="rightframe">UNKNOWN_LENGTH</A>
+</nobr><br>
+<!-- Method unregisterListener -->
+<i>unregisterListener</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.unregisterListener_added(android.hardware.SensorEventListener)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>SensorEventListener</code>)</b>&nbsp;in&nbsp;android.hardware.SensorManager
+</A></nobr><br>
+<!-- Method unregisterListener -->
+&nbsp;&nbsp;<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.unregisterListener_added(android.hardware.SensorEventListener, android.hardware.Sensor)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>SensorEventListener, Sensor</code>)</b>&nbsp;in&nbsp;android.hardware.SensorManager
+</A></nobr><br>
+<!-- Method update -->
+<i>update</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.update_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.widget.PopupWindow
+</A></nobr><br>
+<!-- Method update -->
+&nbsp;&nbsp;<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.update_added(int, int, int, int, boolean)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>int, int, int, int, boolean</code>)</b>&nbsp;in&nbsp;android.widget.PopupWindow
+</A></nobr><br>
+<!-- Field UPDATE_DEVICE_STATS -->
+<nobr><A HREF="android.Manifest.permission.html#android.Manifest.permission.UPDATE_DEVICE_STATS" class="hiddenlink" target="rightframe">UPDATE_DEVICE_STATS</A>
+</nobr><br>
+<!-- Class UpdateAppearance -->
+<A HREF="pkg_android.text.style.html#UpdateAppearance" class="hiddenlink" target="rightframe"><b><i>UpdateAppearance</i></b></A><br>
+<!-- Field updatePeriodMillis -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.updatePeriodMillis" class="hiddenlink" target="rightframe">updatePeriodMillis</A>
+</nobr><br>
+<!-- Constructor URLSpan -->
+<nobr><A HREF="android.text.style.URLSpan.html#android.text.style.URLSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>URLSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Class UserDictionary -->
+<A HREF="pkg_android.provider.html#UserDictionary" class="hiddenlink" target="rightframe"><b>UserDictionary</b></A><br>
+<!-- Class UserDictionary.Words -->
+<A HREF="pkg_android.provider.html#UserDictionary.Words" class="hiddenlink" target="rightframe"><b>UserDictionary.Words</b></A><br>
+<!-- Field verticalCorrection -->
+<A NAME="V"></A>
+<br><font size="+2">V</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.R.attr.html#android.R.attr.verticalCorrection" class="hiddenlink" target="rightframe">verticalCorrection</A>
+</nobr><br>
+<!-- Field verticalGap -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.verticalGap" class="hiddenlink" target="rightframe">verticalGap</A>
+</nobr><br>
+<!-- Field VideoView_error_text_invalid_progressive_playback -->
+<nobr><A HREF="android.R.string.html#android.R.string.VideoView_error_text_invalid_progressive_playback" class="hiddenlink" target="rightframe">VideoView_error_text_invalid_progressive_playback</A>
+</nobr><br>
+<!-- Class ViewDebug.CapturedViewProperty -->
+<A HREF="pkg_android.view.html#ViewDebug.CapturedViewProperty" class="hiddenlink" target="rightframe"><b>ViewDebug.CapturedViewProperty</b></A><br>
+<!-- Class ViewTreeObserver.OnScrollChangedListener -->
+<A HREF="pkg_android.view.html#ViewTreeObserver.OnScrollChangedListener" class="hiddenlink" target="rightframe"><b><i>ViewTreeObserver.OnScrollChangedListener</i></b></A><br>
+<!-- Class Visibility -->
+<A HREF="pkg_android.opengl.html#Visibility" class="hiddenlink" target="rightframe"><b>Visibility</b></A><br>
+<!-- Field voiceLanguage -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.voiceLanguage" class="hiddenlink" target="rightframe">voiceLanguage</A>
+</nobr><br>
+<!-- Field voiceLanguageModel -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.voiceLanguageModel" class="hiddenlink" target="rightframe">voiceLanguageModel</A>
+</nobr><br>
+<!-- Field voiceMaxResults -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.voiceMaxResults" class="hiddenlink" target="rightframe">voiceMaxResults</A>
+</nobr><br>
+<!-- Field voicePromptText -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.voicePromptText" class="hiddenlink" target="rightframe">voicePromptText</A>
+</nobr><br>
+<!-- Field voiceSearchMode -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.voiceSearchMode" class="hiddenlink" target="rightframe">voiceSearchMode</A>
+</nobr><br>
+<!-- Field VOLUME_NOTIFICATION -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.VOLUME_NOTIFICATION" class="hiddenlink" target="rightframe">VOLUME_NOTIFICATION</A>
+</nobr><br>
+<!-- Field Widget_KeyboardView -->
+<A NAME="W"></A>
+<br><font size="+2">W</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.R.style.html#android.R.style.Widget_KeyboardView" class="hiddenlink" target="rightframe">Widget_KeyboardView</A>
+</nobr><br>
+<!-- Field WIFI_MAX_DHCP_RETRY_COUNT -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_MAX_DHCP_RETRY_COUNT" class="hiddenlink" target="rightframe">WIFI_MAX_DHCP_RETRY_COUNT</A>
+</nobr><br>
+<!-- Field WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS" class="hiddenlink" target="rightframe">WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS</A>
+</nobr><br>
+<!-- Field WIFI_MODE_FULL -->
+<nobr><A HREF="android.net.wifi.WifiManager.html#android.net.wifi.WifiManager.WIFI_MODE_FULL" class="hiddenlink" target="rightframe">WIFI_MODE_FULL</A>
+</nobr><br>
+<!-- Field WIFI_MODE_SCAN_ONLY -->
+<nobr><A HREF="android.net.wifi.WifiManager.html#android.net.wifi.WifiManager.WIFI_MODE_SCAN_ONLY" class="hiddenlink" target="rightframe">WIFI_MODE_SCAN_ONLY</A>
+</nobr><br>
+<!-- Field WIFI_SLEEP_POLICY -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_SLEEP_POLICY" class="hiddenlink" target="rightframe">WIFI_SLEEP_POLICY</A>
+</nobr><br>
+<!-- Field WIFI_SLEEP_POLICY_DEFAULT -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_SLEEP_POLICY_DEFAULT" class="hiddenlink" target="rightframe">WIFI_SLEEP_POLICY_DEFAULT</A>
+</nobr><br>
+<!-- Field WIFI_SLEEP_POLICY_NEVER -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_SLEEP_POLICY_NEVER" class="hiddenlink" target="rightframe">WIFI_SLEEP_POLICY_NEVER</A>
+</nobr><br>
+<!-- Field WIFI_SLEEP_POLICY_NEVER_WHILE_PLUGGED -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_SLEEP_POLICY_NEVER_WHILE_PLUGGED" class="hiddenlink" target="rightframe">WIFI_SLEEP_POLICY_NEVER_WHILE_PLUGGED</A>
+</nobr><br>
+<!-- Field windowDisablePreview -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.windowDisablePreview" class="hiddenlink" target="rightframe">windowDisablePreview</A>
+</nobr><br>
+<!-- Field windowNoDisplay -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.windowNoDisplay" class="hiddenlink" target="rightframe">windowNoDisplay</A>
+</nobr><br>
+<!-- Field windowSoftInputMode -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.windowSoftInputMode" class="hiddenlink" target="rightframe">windowSoftInputMode</A>
+</nobr><br>
+<!-- Field WRITE_SECURE_SETTINGS -->
+<nobr><A HREF="android.Manifest.permission.html#android.Manifest.permission.WRITE_SECURE_SETTINGS" class="hiddenlink" target="rightframe">WRITE_SECURE_SETTINGS</A>
+</nobr><br>
+<!-- Method writeToParcel -->
+<i>writeToParcel</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.content.res.AssetFileDescriptor.html#android.content.res.AssetFileDescriptor.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.content.res.AssetFileDescriptor
+</A></nobr><br>
+<!-- Method writeToParcel -->
+&nbsp;&nbsp;<nobr><A HREF="android.graphics.RectF.html#android.graphics.RectF.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.graphics.RectF
+</A></nobr><br>
+<!-- Method writeToParcel -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.Annotation.html#android.text.Annotation.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.Annotation
+</A></nobr><br>
+<!-- Method writeToParcel -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.AbsoluteSizeSpan.html#android.text.style.AbsoluteSizeSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.AbsoluteSizeSpan
+</A></nobr><br>
+<!-- Method writeToParcel -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.AlignmentSpan.Standard.html#android.text.style.AlignmentSpan.Standard.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.AlignmentSpan.Standard
+</A></nobr><br>
+<!-- Method writeToParcel -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.BackgroundColorSpan.html#android.text.style.BackgroundColorSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.BackgroundColorSpan
+</A></nobr><br>
+<!-- Method writeToParcel -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.BulletSpan.html#android.text.style.BulletSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.BulletSpan
+</A></nobr><br>
+<!-- Method writeToParcel -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.ForegroundColorSpan.html#android.text.style.ForegroundColorSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.ForegroundColorSpan
+</A></nobr><br>
+<!-- Method writeToParcel -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.LeadingMarginSpan.Standard.html#android.text.style.LeadingMarginSpan.Standard.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.LeadingMarginSpan.Standard
+</A></nobr><br>
+<!-- Method writeToParcel -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.QuoteSpan.html#android.text.style.QuoteSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.QuoteSpan
+</A></nobr><br>
+<!-- Method writeToParcel -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.RelativeSizeSpan.html#android.text.style.RelativeSizeSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.RelativeSizeSpan
+</A></nobr><br>
+<!-- Method writeToParcel -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.ScaleXSpan.html#android.text.style.ScaleXSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.ScaleXSpan
+</A></nobr><br>
+<!-- Method writeToParcel -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.StrikethroughSpan.html#android.text.style.StrikethroughSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.StrikethroughSpan
+</A></nobr><br>
+<!-- Method writeToParcel -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.StyleSpan.html#android.text.style.StyleSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.StyleSpan
+</A></nobr><br>
+<!-- Method writeToParcel -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.SubscriptSpan.html#android.text.style.SubscriptSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.SubscriptSpan
+</A></nobr><br>
+<!-- Method writeToParcel -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.SuperscriptSpan.html#android.text.style.SuperscriptSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.SuperscriptSpan
+</A></nobr><br>
+<!-- Method writeToParcel -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.TextAppearanceSpan.html#android.text.style.TextAppearanceSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.TextAppearanceSpan
+</A></nobr><br>
+<!-- Method writeToParcel -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.TypefaceSpan.html#android.text.style.TypefaceSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.TypefaceSpan
+</A></nobr><br>
+<!-- Method writeToParcel -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.URLSpan.html#android.text.style.URLSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.URLSpan
+</A></nobr><br>
+<!-- Method writeToParcel -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.UnderlineSpan.html#android.text.style.UnderlineSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.UnderlineSpan
+</A></nobr><br>
+<!-- Method yieldIfContendedSafely -->
+<A NAME="Y"></A>
+<br><font size="+2">Y</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.database.sqlite.SQLiteDatabase.html#android.database.sqlite.SQLiteDatabase.yieldIfContendedSafely_added()" class="hiddenlink" target="rightframe"><b>yieldIfContendedSafely</b>
+()</A></nobr><br>
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/alldiffs_index_all.html b/docs/html/sdk/api_diff/3/changes/alldiffs_index_all.html
new file mode 100644
index 000000000000..48da98bb8776
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/alldiffs_index_all.html
@@ -0,0 +1,4178 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+All Differences Index
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY class="gc-documentation">
+<a NAME="topheader"></a>
+<table summary="Index for All Differences" width="100%" class="jdiffIndex" border="0" cellspacing="0" cellpadding="0" style="padding-bottom:0;margin-bottom:0;">
+  <tr>
+  <th class="indexHeader">
+    Filter the Index:
+  </th>
+  </tr>
+  <tr>
+  <td class="indexText" style="line-height:1.3em;padding-left:2em;">
+<b>All Differences</b>
+  <br>
+<A HREF="alldiffs_index_removals.html" xclass="hiddenlink">Removals</A>
+  <br>
+<A HREF="alldiffs_index_additions.html"xclass="hiddenlink">Additions</A>
+  <br>
+<A HREF="alldiffs_index_changes.html"xclass="hiddenlink">Changes</A>
+  </td>
+  </tr>
+</table>
+<div id="indexTableCaption">
+<font size="-2"><strong>Bold</strong>&nbsp;indicates&nbsp;New;&nbsp;<strike>Strike</strike>&nbsp;indicates&nbsp;deleted. Plain indicates changed.</font>
+</div>
+<!-- Class AbsListView -->
+<A NAME="A"></A>
+<br><font size="+2">A</font>&nbsp;
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.widget.AbsListView.html" class="hiddenlink" target="rightframe">AbsListView</A><br>
+<!-- Class AbsoluteLayout -->
+<A HREF="android.widget.AbsoluteLayout.html" class="hiddenlink" target="rightframe">AbsoluteLayout</A><br>
+<!-- Class AbsoluteSizeSpan -->
+<i>AbsoluteSizeSpan</i><br>
+&nbsp;&nbsp;<A HREF="android.text.style.AbsoluteSizeSpan.html" class="hiddenlink" target="rightframe">android.text.style</A><br>
+<!-- Constructor AbsoluteSizeSpan -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.AbsoluteSizeSpan.html#android.text.style.AbsoluteSizeSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>AbsoluteSizeSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Class AbsSeekBar -->
+<A HREF="android.widget.AbsSeekBar.html" class="hiddenlink" target="rightframe">AbsSeekBar</A><br>
+<!-- Field ACCELEROMETER_ROTATION -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.ACCELEROMETER_ROTATION" class="hiddenlink" target="rightframe">ACCELEROMETER_ROTATION</A>
+</nobr><br>
+<!-- Field ACTION_AIRPLANE_MODE_SETTINGS -->
+<nobr><A HREF="android.provider.Settings.html#android.provider.Settings.ACTION_AIRPLANE_MODE_SETTINGS" class="hiddenlink" target="rightframe">ACTION_AIRPLANE_MODE_SETTINGS</A>
+</nobr><br>
+<!-- Field ACTION_APPLICATION_DEVELOPMENT_SETTINGS -->
+<nobr><A HREF="android.provider.Settings.html#android.provider.Settings.ACTION_APPLICATION_DEVELOPMENT_SETTINGS" class="hiddenlink" target="rightframe">ACTION_APPLICATION_DEVELOPMENT_SETTINGS</A>
+</nobr><br>
+<!-- Field ACTION_AUDIO_BECOMING_NOISY -->
+<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.ACTION_AUDIO_BECOMING_NOISY" class="hiddenlink" target="rightframe">ACTION_AUDIO_BECOMING_NOISY</A>
+</nobr><br>
+<!-- Field ACTION_BACKGROUND_DATA_SETTING_CHANGED -->
+<nobr><A HREF="android.net.ConnectivityManager.html#android.net.ConnectivityManager.ACTION_BACKGROUND_DATA_SETTING_CHANGED" class="hiddenlink" target="rightframe">ACTION_BACKGROUND_DATA_SETTING_CHANGED</A>
+</nobr><br>
+<!-- Field ACTION_DATA_ROAMING_SETTINGS -->
+<nobr><A HREF="android.provider.Settings.html#android.provider.Settings.ACTION_DATA_ROAMING_SETTINGS" class="hiddenlink" target="rightframe">ACTION_DATA_ROAMING_SETTINGS</A>
+</nobr><br>
+<!-- Field ACTION_IMAGE_CAPTURE -->
+<nobr><A HREF="android.provider.MediaStore.html#android.provider.MediaStore.ACTION_IMAGE_CAPTURE" class="hiddenlink" target="rightframe">ACTION_IMAGE_CAPTURE</A>
+</nobr><br>
+<!-- Field ACTION_INPUT_METHOD_CHANGED -->
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.ACTION_INPUT_METHOD_CHANGED" class="hiddenlink" target="rightframe">ACTION_INPUT_METHOD_CHANGED</A>
+</nobr><br>
+<!-- Field ACTION_INPUT_METHOD_SETTINGS -->
+<nobr><A HREF="android.provider.Settings.html#android.provider.Settings.ACTION_INPUT_METHOD_SETTINGS" class="hiddenlink" target="rightframe">ACTION_INPUT_METHOD_SETTINGS</A>
+</nobr><br>
+<!-- Field ACTION_INTERNAL_STORAGE_SETTINGS -->
+<nobr><A HREF="android.provider.Settings.html#android.provider.Settings.ACTION_INTERNAL_STORAGE_SETTINGS" class="hiddenlink" target="rightframe">ACTION_INTERNAL_STORAGE_SETTINGS</A>
+</nobr><br>
+<!-- Field ACTION_MANAGE_APPLICATIONS_SETTINGS -->
+<nobr><A HREF="android.provider.Settings.html#android.provider.Settings.ACTION_MANAGE_APPLICATIONS_SETTINGS" class="hiddenlink" target="rightframe">ACTION_MANAGE_APPLICATIONS_SETTINGS</A>
+</nobr><br>
+<!-- Field ACTION_MEDIA_CHECKING -->
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.ACTION_MEDIA_CHECKING" class="hiddenlink" target="rightframe">ACTION_MEDIA_CHECKING</A>
+</nobr><br>
+<!-- Field ACTION_MEDIA_NOFS -->
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.ACTION_MEDIA_NOFS" class="hiddenlink" target="rightframe">ACTION_MEDIA_NOFS</A>
+</nobr><br>
+<!-- Field ACTION_MEMORY_CARD_SETTINGS -->
+<nobr><A HREF="android.provider.Settings.html#android.provider.Settings.ACTION_MEMORY_CARD_SETTINGS" class="hiddenlink" target="rightframe">ACTION_MEMORY_CARD_SETTINGS</A>
+</nobr><br>
+<!-- Field ACTION_NETWORK_OPERATOR_SETTINGS -->
+<nobr><A HREF="android.provider.Settings.html#android.provider.Settings.ACTION_NETWORK_OPERATOR_SETTINGS" class="hiddenlink" target="rightframe">ACTION_NETWORK_OPERATOR_SETTINGS</A>
+</nobr><br>
+<!-- Field ACTION_OUTSIDE -->
+<nobr><A HREF="android.view.MotionEvent.html#android.view.MotionEvent.ACTION_OUTSIDE" class="hiddenlink" target="rightframe">ACTION_OUTSIDE</A>
+</nobr><br>
+<!-- Field ACTION_PACKAGE_DATA_CLEARED -->
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.ACTION_PACKAGE_DATA_CLEARED" class="hiddenlink" target="rightframe">ACTION_PACKAGE_DATA_CLEARED</A>
+</nobr><br>
+<!-- Field ACTION_PACKAGE_REPLACED -->
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.ACTION_PACKAGE_REPLACED" class="hiddenlink" target="rightframe">ACTION_PACKAGE_REPLACED</A>
+</nobr><br>
+<!-- Field ACTION_PHONE_STATE_CHANGED -->
+<nobr><A HREF="android.telephony.TelephonyManager.html#android.telephony.TelephonyManager.ACTION_PHONE_STATE_CHANGED" class="hiddenlink" target="rightframe">ACTION_PHONE_STATE_CHANGED</A>
+</nobr><br>
+<!-- Field ACTION_QUICK_LAUNCH_SETTINGS -->
+<nobr><A HREF="android.provider.Settings.html#android.provider.Settings.ACTION_QUICK_LAUNCH_SETTINGS" class="hiddenlink" target="rightframe">ACTION_QUICK_LAUNCH_SETTINGS</A>
+</nobr><br>
+<!-- Field ACTION_SEARCH_LONG_PRESS -->
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.ACTION_SEARCH_LONG_PRESS" class="hiddenlink" target="rightframe">ACTION_SEARCH_LONG_PRESS</A>
+</nobr><br>
+<!-- Field ACTION_SYNC_SETTINGS -->
+<nobr><A HREF="android.provider.Settings.html#android.provider.Settings.ACTION_SYNC_SETTINGS" class="hiddenlink" target="rightframe">ACTION_SYNC_SETTINGS</A>
+</nobr><br>
+<!-- Field ACTION_SYSTEM_TUTORIAL -->
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.ACTION_SYSTEM_TUTORIAL" class="hiddenlink" target="rightframe">ACTION_SYSTEM_TUTORIAL</A>
+</nobr><br>
+<!-- Field ACTION_USER_DICTIONARY_SETTINGS -->
+<nobr><A HREF="android.provider.Settings.html#android.provider.Settings.ACTION_USER_DICTIONARY_SETTINGS" class="hiddenlink" target="rightframe">ACTION_USER_DICTIONARY_SETTINGS</A>
+</nobr><br>
+<!-- Field ACTION_USER_PRESENT -->
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.ACTION_USER_PRESENT" class="hiddenlink" target="rightframe">ACTION_USER_PRESENT</A>
+</nobr><br>
+<!-- Field ACTION_VIDEO_CAPTURE -->
+<nobr><A HREF="android.provider.MediaStore.html#android.provider.MediaStore.ACTION_VIDEO_CAPTURE" class="hiddenlink" target="rightframe">ACTION_VIDEO_CAPTURE</A>
+</nobr><br>
+<!-- Field ACTION_WIFI_IP_SETTINGS -->
+<nobr><A HREF="android.provider.Settings.html#android.provider.Settings.ACTION_WIFI_IP_SETTINGS" class="hiddenlink" target="rightframe">ACTION_WIFI_IP_SETTINGS</A>
+</nobr><br>
+<!-- Class Activity -->
+<A HREF="android.app.Activity.html" class="hiddenlink" target="rightframe">Activity</A><br>
+<!-- Class ActivityInfo -->
+<A HREF="android.content.pm.ActivityInfo.html" class="hiddenlink" target="rightframe">ActivityInfo</A><br>
+<!-- Class ActivityInstrumentationTestCase -->
+<A HREF="android.test.ActivityInstrumentationTestCase.html" class="hiddenlink" target="rightframe">ActivityInstrumentationTestCase</A><br>
+<!-- Class ActivityInstrumentationTestCase2 -->
+<A HREF="pkg_android.test.html#ActivityInstrumentationTestCase2" class="hiddenlink" target="rightframe"><b>ActivityInstrumentationTestCase2</b></A><br>
+<!-- Class ActivityManager -->
+<A HREF="android.app.ActivityManager.html" class="hiddenlink" target="rightframe">ActivityManager</A><br>
+<!-- Class ActivityManager.RunningAppProcessInfo -->
+<A HREF="pkg_android.app.html#ActivityManager.RunningAppProcessInfo" class="hiddenlink" target="rightframe"><b>ActivityManager.RunningAppProcessInfo</b></A><br>
+<!-- Field ADB_ENABLED -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.ADB_ENABLED" class="hiddenlink" target="rightframe">ADB_ENABLED</A>
+</nobr><br>
+<!-- Method addGpsStatusListener -->
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.addGpsStatusListener_added(android.location.GpsStatus.Listener)" class="hiddenlink" target="rightframe"><b>addGpsStatusListener</b>
+(<code>Listener</code>)</A></nobr><br>
+<!-- Method addOnScrollChangedListener -->
+<nobr><A HREF="android.view.ViewTreeObserver.html#android.view.ViewTreeObserver.addOnScrollChangedListener_added(android.view.ViewTreeObserver.OnScrollChangedListener)" class="hiddenlink" target="rightframe"><b>addOnScrollChangedListener</b>
+(<code>OnScrollChangedListener</code>)</A></nobr><br>
+<!-- Method addPropertyChangeListener -->
+<i>addPropertyChangeListener</i><br>
+&nbsp;&nbsp;<nobr><A HREF="java.util.jar.Pack200.Packer.html#java.util.jar.Pack200.Packer.addPropertyChangeListener_added(java.beans.PropertyChangeListener)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>PropertyChangeListener</code>)</b>&nbsp;in&nbsp;java.util.jar.Pack200.Packer
+</A></nobr><br>
+<!-- Method addPropertyChangeListener -->
+&nbsp;&nbsp;<nobr><A HREF="java.util.jar.Pack200.Unpacker.html#java.util.jar.Pack200.Unpacker.addPropertyChangeListener_added(java.beans.PropertyChangeListener)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>PropertyChangeListener</code>)</b>&nbsp;in&nbsp;java.util.jar.Pack200.Unpacker
+</A></nobr><br>
+<!-- Method addPropertyChangeListener -->
+&nbsp;&nbsp;<nobr><A HREF="java.util.logging.LogManager.html#java.util.logging.LogManager.addPropertyChangeListener_added(java.beans.PropertyChangeListener)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>PropertyChangeListener</code>)</b>&nbsp;in&nbsp;java.util.logging.LogManager
+</A></nobr><br>
+<!-- Method addRequirements -->
+<nobr><A HREF="android.test.suitebuilder.TestSuiteBuilder.html#android.test.suitebuilder.TestSuiteBuilder.addRequirements_changed(com.android.internal.util.Predicate<android.test.suitebuilder.TestMethod>...)" class="hiddenlink" target="rightframe">addRequirements
+(<code>Predicate&lt;TestMethod&gt;</code>)</A></nobr><br>
+<!-- Method addTestProvider -->
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.addTestProvider_added(java.lang.String, boolean, boolean, boolean, boolean, boolean, boolean, boolean, int, int)" class="hiddenlink" target="rightframe"><b>addTestProvider</b>
+(<code>String, boolean, boolean, boolean, boolean, boolean, boolean, boolean, int, int</code>)</A></nobr><br>
+<!-- Field addToDictionary -->
+<nobr><A HREF="android.R.id.html#android.R.id.addToDictionary" class="hiddenlink" target="rightframe">addToDictionary</A>
+</nobr><br>
+<!-- Method adjustMetaAfterKeypress -->
+<nobr><A HREF="android.text.method.MetaKeyKeyListener.html#android.text.method.MetaKeyKeyListener.adjustMetaAfterKeypress_added(long)" class="hiddenlink" target="rightframe"><b>adjustMetaAfterKeypress</b>
+(<code>long</code>)</A></nobr><br>
+<!-- Class AlarmManager -->
+<A HREF="android.app.AlarmManager.html" class="hiddenlink" target="rightframe">AlarmManager</A><br>
+<!-- Class AlertDialog -->
+<A HREF="android.app.AlertDialog.html" class="hiddenlink" target="rightframe">AlertDialog</A><br>
+<!-- Field ALIGN_BASELINE -->
+<nobr><A HREF="android.text.style.DynamicDrawableSpan.html#android.text.style.DynamicDrawableSpan.ALIGN_BASELINE" class="hiddenlink" target="rightframe">ALIGN_BASELINE</A>
+</nobr><br>
+<!-- Field ALIGN_BOTTOM -->
+<nobr><A HREF="android.text.style.DynamicDrawableSpan.html#android.text.style.DynamicDrawableSpan.ALIGN_BOTTOM" class="hiddenlink" target="rightframe">ALIGN_BOTTOM</A>
+</nobr><br>
+<!-- Class AlignmentSpan.Standard -->
+<i>AlignmentSpan.Standard</i><br>
+&nbsp;&nbsp;<A HREF="android.text.style.AlignmentSpan.Standard.html" class="hiddenlink" target="rightframe">android.text.style</A><br>
+<!-- Constructor AlignmentSpan.Standard -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.AlignmentSpan.Standard.html#android.text.style.AlignmentSpan.Standard.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>AlignmentSpan.Standard</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Field allowSingleTap -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.allowSingleTap" class="hiddenlink" target="rightframe">allowSingleTap</A>
+</nobr><br>
+<!-- Class AlphabetIndexer -->
+<A HREF="pkg_android.widget.html#AlphabetIndexer" class="hiddenlink" target="rightframe"><b>AlphabetIndexer</b></A><br>
+<!-- Package android -->
+<A HREF="pkg_android.html" class="hiddenlink" target="rightframe">android</A><br>
+<!-- Package android.app -->
+<A HREF="pkg_android.app.html" class="hiddenlink" target="rightframe">android.app</A><br>
+<!-- Package android.appwidget -->
+<A HREF="changes-summary.html#android.appwidget" class="hiddenlink" target="rightframe"><b>android.appwidget</b></A><br>
+<!-- Package android.content -->
+<A HREF="pkg_android.content.html" class="hiddenlink" target="rightframe">android.content</A><br>
+<!-- Package android.content.pm -->
+<A HREF="pkg_android.content.pm.html" class="hiddenlink" target="rightframe">android.content.pm</A><br>
+<!-- Package android.content.res -->
+<A HREF="pkg_android.content.res.html" class="hiddenlink" target="rightframe">android.content.res</A><br>
+<!-- Package android.database -->
+<A HREF="pkg_android.database.html" class="hiddenlink" target="rightframe">android.database</A><br>
+<!-- Package android.database.sqlite -->
+<A HREF="pkg_android.database.sqlite.html" class="hiddenlink" target="rightframe">android.database.sqlite</A><br>
+<!-- Package android.graphics -->
+<A HREF="pkg_android.graphics.html" class="hiddenlink" target="rightframe">android.graphics</A><br>
+<!-- Package android.graphics.drawable -->
+<A HREF="pkg_android.graphics.drawable.html" class="hiddenlink" target="rightframe">android.graphics.drawable</A><br>
+<!-- Package android.graphics.drawable.shapes -->
+<A HREF="pkg_android.graphics.drawable.shapes.html" class="hiddenlink" target="rightframe">android.graphics.drawable.shapes</A><br>
+<!-- Package android.hardware -->
+<A HREF="pkg_android.hardware.html" class="hiddenlink" target="rightframe">android.hardware</A><br>
+<!-- Package android.inputmethodservice -->
+<A HREF="changes-summary.html#android.inputmethodservice" class="hiddenlink" target="rightframe"><b>android.inputmethodservice</b></A><br>
+<!-- Package android.location -->
+<A HREF="pkg_android.location.html" class="hiddenlink" target="rightframe">android.location</A><br>
+<!-- Package android.media -->
+<A HREF="pkg_android.media.html" class="hiddenlink" target="rightframe">android.media</A><br>
+<!-- Package android.net -->
+<A HREF="pkg_android.net.html" class="hiddenlink" target="rightframe">android.net</A><br>
+<!-- Package android.net.wifi -->
+<A HREF="pkg_android.net.wifi.html" class="hiddenlink" target="rightframe">android.net.wifi</A><br>
+<!-- Package android.opengl -->
+<A HREF="pkg_android.opengl.html" class="hiddenlink" target="rightframe">android.opengl</A><br>
+<!-- Package android.os -->
+<A HREF="pkg_android.os.html" class="hiddenlink" target="rightframe">android.os</A><br>
+<!-- Package android.preference -->
+<A HREF="pkg_android.preference.html" class="hiddenlink" target="rightframe">android.preference</A><br>
+<!-- Package android.provider -->
+<A HREF="pkg_android.provider.html" class="hiddenlink" target="rightframe">android.provider</A><br>
+<!-- Package android.speech -->
+<A HREF="changes-summary.html#android.speech" class="hiddenlink" target="rightframe"><b>android.speech</b></A><br>
+<!-- Package android.telephony -->
+<A HREF="pkg_android.telephony.html" class="hiddenlink" target="rightframe">android.telephony</A><br>
+<!-- Package android.telephony.gsm -->
+<A HREF="pkg_android.telephony.gsm.html" class="hiddenlink" target="rightframe">android.telephony.gsm</A><br>
+<!-- Package android.test -->
+<A HREF="pkg_android.test.html" class="hiddenlink" target="rightframe">android.test</A><br>
+<!-- Package android.test.mock -->
+<A HREF="pkg_android.test.mock.html" class="hiddenlink" target="rightframe">android.test.mock</A><br>
+<!-- Package android.test.suitebuilder -->
+<A HREF="pkg_android.test.suitebuilder.html" class="hiddenlink" target="rightframe">android.test.suitebuilder</A><br>
+<!-- Package android.text -->
+<A HREF="pkg_android.text.html" class="hiddenlink" target="rightframe">android.text</A><br>
+<!-- Package android.text.format -->
+<A HREF="changes-summary.html#android.text.format" class="hiddenlink" target="rightframe"><b>android.text.format</b></A><br>
+<!-- Package android.text.method -->
+<A HREF="pkg_android.text.method.html" class="hiddenlink" target="rightframe">android.text.method</A><br>
+<!-- Package android.text.style -->
+<A HREF="pkg_android.text.style.html" class="hiddenlink" target="rightframe">android.text.style</A><br>
+<!-- Package android.util -->
+<A HREF="pkg_android.util.html" class="hiddenlink" target="rightframe">android.util</A><br>
+<!-- Package android.view -->
+<A HREF="pkg_android.view.html" class="hiddenlink" target="rightframe">android.view</A><br>
+<!-- Package android.view.animation -->
+<A HREF="pkg_android.view.animation.html" class="hiddenlink" target="rightframe">android.view.animation</A><br>
+<!-- Package android.view.inputmethod -->
+<A HREF="changes-summary.html#android.view.inputmethod" class="hiddenlink" target="rightframe"><b>android.view.inputmethod</b></A><br>
+<!-- Package android.webkit -->
+<A HREF="pkg_android.webkit.html" class="hiddenlink" target="rightframe">android.webkit</A><br>
+<!-- Package android.widget -->
+<A HREF="pkg_android.widget.html" class="hiddenlink" target="rightframe">android.widget</A><br>
+<!-- Field ANDROID_ID -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.ANDROID_ID" class="hiddenlink" target="rightframe">ANDROID_ID</A>
+</nobr><br>
+<!-- Field animateOnClick -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.animateOnClick" class="hiddenlink" target="rightframe">animateOnClick</A>
+</nobr><br>
+<!-- Class Animation -->
+<A HREF="android.view.animation.Animation.html" class="hiddenlink" target="rightframe">Animation</A><br>
+<!-- Class Annotation -->
+<i>Annotation</i><br>
+&nbsp;&nbsp;<A HREF="android.text.Annotation.html" class="hiddenlink" target="rightframe">android.text</A><br>
+<!-- Constructor Annotation -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.Annotation.html#android.text.Annotation.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>Annotation</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Method appendEscapedSQLString -->
+<nobr><A HREF="android.database.DatabaseUtils.html#android.database.DatabaseUtils.appendEscapedSQLString_changed(java.lang.StringBuilder, java.lang.String)" class="hiddenlink" target="rightframe">appendEscapedSQLString
+(<code>StringBuilder, String</code>)</A></nobr><br>
+<!-- Method applyDisplay -->
+<nobr><A HREF="android.view.Gravity.html#android.view.Gravity.applyDisplay_added(int, android.graphics.Rect, android.graphics.Rect)" class="hiddenlink" target="rightframe"><b>applyDisplay</b>
+(<code>int, Rect, Rect</code>)</A></nobr><br>
+<!-- Class ArrayAdapter -->
+<A HREF="android.widget.ArrayAdapter.html" class="hiddenlink" target="rightframe">ArrayAdapter</A><br>
+<!-- Class ArrowKeyMovementMethod -->
+<A HREF="android.text.method.ArrowKeyMovementMethod.html" class="hiddenlink" target="rightframe">ArrowKeyMovementMethod</A><br>
+<!-- Class AssetFileDescriptor -->
+<A HREF="android.content.res.AssetFileDescriptor.html" class="hiddenlink" target="rightframe">AssetFileDescriptor</A><br>
+<!-- Class AssetFileDescriptor.AutoCloseInputStream -->
+<A HREF="pkg_android.content.res.html#AssetFileDescriptor.AutoCloseInputStream" class="hiddenlink" target="rightframe"><b>AssetFileDescriptor.AutoCloseInputStream</b></A><br>
+<!-- Class AssetFileDescriptor.AutoCloseOutputStream -->
+<A HREF="pkg_android.content.res.html#AssetFileDescriptor.AutoCloseOutputStream" class="hiddenlink" target="rightframe"><b>AssetFileDescriptor.AutoCloseOutputStream</b></A><br>
+<!-- Class AsyncTask -->
+<A HREF="pkg_android.os.html#AsyncTask" class="hiddenlink" target="rightframe"><b>AsyncTask</b></A><br>
+<!-- Class AsyncTask.Status -->
+<A HREF="pkg_android.os.html#AsyncTask.Status" class="hiddenlink" target="rightframe"><b>AsyncTask.Status</b></A><br>
+<!-- Class AudioFormat -->
+<A HREF="pkg_android.media.html#AudioFormat" class="hiddenlink" target="rightframe"><b>AudioFormat</b></A><br>
+<!-- Class AudioManager -->
+<A HREF="android.media.AudioManager.html" class="hiddenlink" target="rightframe">AudioManager</A><br>
+<!-- Class AudioRecord -->
+<A HREF="pkg_android.media.html#AudioRecord" class="hiddenlink" target="rightframe"><b>AudioRecord</b></A><br>
+<!-- Class AudioRecord.OnRecordPositionUpdateListener -->
+<A HREF="pkg_android.media.html#AudioRecord.OnRecordPositionUpdateListener" class="hiddenlink" target="rightframe"><b><i>AudioRecord.OnRecordPositionUpdateListener</i></b></A><br>
+<!-- Class AudioTrack -->
+<A HREF="pkg_android.media.html#AudioTrack" class="hiddenlink" target="rightframe"><b>AudioTrack</b></A><br>
+<!-- Class AudioTrack.OnPlaybackPositionUpdateListener -->
+<A HREF="pkg_android.media.html#AudioTrack.OnPlaybackPositionUpdateListener" class="hiddenlink" target="rightframe"><b><i>AudioTrack.OnPlaybackPositionUpdateListener</i></b></A><br>
+<!-- Class AutoCompleteTextView -->
+<A HREF="android.widget.AutoCompleteTextView.html" class="hiddenlink" target="rightframe">AutoCompleteTextView</A><br>
+<!-- Class AutoText -->
+<A HREF="android.text.AutoText.html" class="hiddenlink" target="rightframe">AutoText</A><br>
+<!-- Field autoText -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.autoText" class="hiddenlink" target="rightframe">autoText</A>
+</nobr><br>
+<!-- Field AXIS_CLIP -->
+<nobr><A HREF="android.view.Gravity.html#android.view.Gravity.AXIS_CLIP" class="hiddenlink" target="rightframe">AXIS_CLIP</A>
+</nobr><br>
+<!-- Field AXIS_MINUS_X -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.AXIS_MINUS_X" class="hiddenlink" target="rightframe">AXIS_MINUS_X</A>
+</nobr><br>
+<!-- Field AXIS_MINUS_Y -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.AXIS_MINUS_Y" class="hiddenlink" target="rightframe">AXIS_MINUS_Y</A>
+</nobr><br>
+<!-- Field AXIS_MINUS_Z -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.AXIS_MINUS_Z" class="hiddenlink" target="rightframe">AXIS_MINUS_Z</A>
+</nobr><br>
+<!-- Field AXIS_X -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.AXIS_X" class="hiddenlink" target="rightframe">AXIS_X</A>
+</nobr><br>
+<!-- Field AXIS_Y -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.AXIS_Y" class="hiddenlink" target="rightframe">AXIS_Y</A>
+</nobr><br>
+<!-- Field AXIS_Z -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.AXIS_Z" class="hiddenlink" target="rightframe">AXIS_Z</A>
+</nobr><br>
+<!-- Class BackgroundColorSpan -->
+<A NAME="B"></A>
+<br><font size="+2">B</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<i>BackgroundColorSpan</i><br>
+&nbsp;&nbsp;<A HREF="android.text.style.BackgroundColorSpan.html" class="hiddenlink" target="rightframe">android.text.style</A><br>
+<!-- Constructor BackgroundColorSpan -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.BackgroundColorSpan.html#android.text.style.BackgroundColorSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>BackgroundColorSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Field backgroundDimEnabled -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.backgroundDimEnabled" class="hiddenlink" target="rightframe">backgroundDimEnabled</A>
+</nobr><br>
+<!-- Class BaseKeyListener -->
+<A HREF="android.text.method.BaseKeyListener.html" class="hiddenlink" target="rightframe">BaseKeyListener</A><br>
+<!-- Method beginBatchEdit -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.beginBatchEdit_added()" class="hiddenlink" target="rightframe"><b>beginBatchEdit</b>
+()</A></nobr><br>
+<!-- Field BIND_APPWIDGET -->
+<nobr><A HREF="android.Manifest.permission.html#android.Manifest.permission.BIND_APPWIDGET" class="hiddenlink" target="rightframe">BIND_APPWIDGET</A>
+</nobr><br>
+<!-- Field BIND_INPUT_METHOD -->
+<nobr><A HREF="android.Manifest.permission.html#android.Manifest.permission.BIND_INPUT_METHOD" class="hiddenlink" target="rightframe">BIND_INPUT_METHOD</A>
+</nobr><br>
+<!-- Class Binder -->
+<A HREF="android.os.Binder.html" class="hiddenlink" target="rightframe">Binder</A><br>
+<!-- Class Bitmap -->
+<A HREF="android.graphics.Bitmap.html" class="hiddenlink" target="rightframe">Bitmap</A><br>
+<!-- Field BLUETOOTH_ON -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.BLUETOOTH_ON" class="hiddenlink" target="rightframe">BLUETOOTH_ON</A>
+</nobr><br>
+<!-- Field BOOKMARK -->
+<nobr><A HREF="android.provider.MediaStore.Video.VideoColumns.html#android.provider.MediaStore.Video.VideoColumns.BOOKMARK" class="hiddenlink" target="rightframe">BOOKMARK</A>
+</nobr><br>
+<!-- Field bottomOffset -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.bottomOffset" class="hiddenlink" target="rightframe">bottomOffset</A>
+</nobr><br>
+<!-- Method bringPointIntoView -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.bringPointIntoView_added(int)" class="hiddenlink" target="rightframe"><b>bringPointIntoView</b>
+(<code>int</code>)</A></nobr><br>
+<!-- Class BroadcastReceiver -->
+<A HREF="android.content.BroadcastReceiver.html" class="hiddenlink" target="rightframe">BroadcastReceiver</A><br>
+<!-- Class Browser -->
+<A HREF="android.provider.Browser.html" class="hiddenlink" target="rightframe">Browser</A><br>
+<!-- Field BUCKET_DISPLAY_NAME -->
+<nobr><A HREF="android.provider.MediaStore.Video.VideoColumns.html#android.provider.MediaStore.Video.VideoColumns.BUCKET_DISPLAY_NAME" class="hiddenlink" target="rightframe">BUCKET_DISPLAY_NAME</A>
+</nobr><br>
+<!-- Field BUCKET_ID -->
+<nobr><A HREF="android.provider.MediaStore.Video.VideoColumns.html#android.provider.MediaStore.Video.VideoColumns.BUCKET_ID" class="hiddenlink" target="rightframe">BUCKET_ID</A>
+</nobr><br>
+<!-- Class Build -->
+<A HREF="android.os.Build.html" class="hiddenlink" target="rightframe">Build</A><br>
+<!-- Class BulletSpan -->
+<i>BulletSpan</i><br>
+&nbsp;&nbsp;<A HREF="android.text.style.BulletSpan.html" class="hiddenlink" target="rightframe">android.text.style</A><br>
+<!-- Constructor BulletSpan -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.BulletSpan.html#android.text.style.BulletSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>BulletSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Field BUTTON1 -->
+<nobr><A HREF="android.content.DialogInterface.html#android.content.DialogInterface.BUTTON1" class="hiddenlink" target="rightframe">BUTTON1</A>
+</nobr><br>
+<!-- Field BUTTON2 -->
+<nobr><A HREF="android.content.DialogInterface.html#android.content.DialogInterface.BUTTON2" class="hiddenlink" target="rightframe">BUTTON2</A>
+</nobr><br>
+<!-- Field BUTTON3 -->
+<nobr><A HREF="android.content.DialogInterface.html#android.content.DialogInterface.BUTTON3" class="hiddenlink" target="rightframe">BUTTON3</A>
+</nobr><br>
+<!-- Field BUTTON_NEGATIVE -->
+<nobr><A HREF="android.content.DialogInterface.html#android.content.DialogInterface.BUTTON_NEGATIVE" class="hiddenlink" target="rightframe">BUTTON_NEGATIVE</A>
+</nobr><br>
+<!-- Field BUTTON_NEUTRAL -->
+<nobr><A HREF="android.content.DialogInterface.html#android.content.DialogInterface.BUTTON_NEUTRAL" class="hiddenlink" target="rightframe">BUTTON_NEUTRAL</A>
+</nobr><br>
+<!-- Field BUTTON_POSITIVE -->
+<nobr><A HREF="android.content.DialogInterface.html#android.content.DialogInterface.BUTTON_POSITIVE" class="hiddenlink" target="rightframe">BUTTON_POSITIVE</A>
+</nobr><br>
+<!-- Method calculateLength -->
+<A NAME="C"></A>
+<br><font size="+2">C</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.telephony.gsm.SmsMessage.html#android.telephony.gsm.SmsMessage.calculateLength_added(java.lang.CharSequence, boolean)" class="hiddenlink" target="rightframe"><b>calculateLength</b>
+(<code>CharSequence, boolean</code>)</A></nobr><br>
+<!-- Method callActivityOnUserLeaving -->
+<nobr><A HREF="android.app.Instrumentation.html#android.app.Instrumentation.callActivityOnUserLeaving_added(android.app.Activity)" class="hiddenlink" target="rightframe"><b>callActivityOnUserLeaving</b>
+(<code>Activity</code>)</A></nobr><br>
+<!-- Class Camera -->
+<A HREF="android.hardware.Camera.html" class="hiddenlink" target="rightframe">Camera</A><br>
+<!-- Field candidatesArea -->
+<nobr><A HREF="android.R.id.html#android.R.id.candidatesArea" class="hiddenlink" target="rightframe">candidatesArea</A>
+</nobr><br>
+<!-- Field candidatesTextStyleSpans -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.candidatesTextStyleSpans" class="hiddenlink" target="rightframe">candidatesTextStyleSpans</A>
+</nobr><br>
+<!-- Class Canvas -->
+<A HREF="android.graphics.Canvas.html" class="hiddenlink" target="rightframe">Canvas</A><br>
+<!-- Field CAP_MODE_CHARACTERS -->
+<nobr><A HREF="android.text.TextUtils.html#android.text.TextUtils.CAP_MODE_CHARACTERS" class="hiddenlink" target="rightframe">CAP_MODE_CHARACTERS</A>
+</nobr><br>
+<!-- Field CAP_MODE_SENTENCES -->
+<nobr><A HREF="android.text.TextUtils.html#android.text.TextUtils.CAP_MODE_SENTENCES" class="hiddenlink" target="rightframe">CAP_MODE_SENTENCES</A>
+</nobr><br>
+<!-- Field CAP_MODE_WORDS -->
+<nobr><A HREF="android.text.TextUtils.html#android.text.TextUtils.CAP_MODE_WORDS" class="hiddenlink" target="rightframe">CAP_MODE_WORDS</A>
+</nobr><br>
+<!-- Field capitalize -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.capitalize" class="hiddenlink" target="rightframe">capitalize</A>
+</nobr><br>
+<!-- Field CATEGORY_GADGET -->
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.CATEGORY_GADGET" class="hiddenlink" target="rightframe"><strike>CATEGORY_GADGET</strike></A>
+</nobr><br>
+<!-- Field CATEGORY_INFO -->
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.CATEGORY_INFO" class="hiddenlink" target="rightframe">CATEGORY_INFO</A>
+</nobr><br>
+<!-- Method changeAction -->
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.changeAction_added(android.view.KeyEvent, int)" class="hiddenlink" target="rightframe"><b>changeAction</b>
+(<code>KeyEvent, int</code>)</A></nobr><br>
+<!-- Method changeCursorAndColumns -->
+<nobr><A HREF="android.widget.SimpleCursorAdapter.html#android.widget.SimpleCursorAdapter.changeCursorAndColumns_added(android.database.Cursor, java.lang.String[], int[])" class="hiddenlink" target="rightframe"><b>changeCursorAndColumns</b>
+(<code>Cursor, String[], int[]</code>)</A></nobr><br>
+<!-- Method changeDebugPort -->
+<nobr><A HREF="android.os.Debug.html#android.os.Debug.changeDebugPort_changed(int)" class="hiddenlink" target="rightframe">changeDebugPort
+(<code>int</code>)</A></nobr><br>
+<!-- Method changeFlags -->
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.changeFlags_added(android.view.KeyEvent, int)" class="hiddenlink" target="rightframe"><b>changeFlags</b>
+(<code>KeyEvent, int</code>)</A></nobr><br>
+<!-- Method changeTimeRepeat -->
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.changeTimeRepeat_added(android.view.KeyEvent, long, int)" class="hiddenlink" target="rightframe"><b>changeTimeRepeat</b>
+(<code>KeyEvent, long, int</code>)</A></nobr><br>
+<!-- Class Character.UnicodeBlock -->
+<A HREF="java.lang.Character.UnicodeBlock.html" class="hiddenlink" target="rightframe">Character.UnicodeBlock</A><br>
+<!-- Method checkInputConnectionProxy -->
+<nobr><A HREF="android.view.View.html#android.view.View.checkInputConnectionProxy_added(android.view.View)" class="hiddenlink" target="rightframe"><b>checkInputConnectionProxy</b>
+(<code>View</code>)</A></nobr><br>
+<!-- Class Chronometer -->
+<A HREF="android.widget.Chronometer.html" class="hiddenlink" target="rightframe">Chronometer</A><br>
+<!-- Class Chronometer.OnChronometerTickListener -->
+<A HREF="pkg_android.widget.html#Chronometer.OnChronometerTickListener" class="hiddenlink" target="rightframe"><b><i>Chronometer.OnChronometerTickListener</i></b></A><br>
+<!-- Class Class -->
+<A HREF="java.lang.Class.html" class="hiddenlink" target="rightframe">Class</A><br>
+<!-- Method clearComposingText -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.clearComposingText_added()" class="hiddenlink" target="rightframe"><b>clearComposingText</b>
+()</A></nobr><br>
+<!-- Method clearListSelection -->
+<nobr><A HREF="android.widget.AutoCompleteTextView.html#android.widget.AutoCompleteTextView.clearListSelection_added()" class="hiddenlink" target="rightframe"><b>clearListSelection</b>
+()</A></nobr><br>
+<!-- Method clearMatches -->
+<nobr><A HREF="android.webkit.WebView.html#android.webkit.WebView.clearMatches_added()" class="hiddenlink" target="rightframe"><b>clearMatches</b>
+()</A></nobr><br>
+<!-- Method clearMetaKeyState -->
+<i>clearMetaKeyState</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.KeyListener.html#android.text.method.KeyListener.clearMetaKeyState_added(android.view.View, android.text.Editable, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>View, Editable, int</code>)</b>&nbsp;in&nbsp;android.text.method.KeyListener
+</A></nobr><br>
+<!-- Method clearMetaKeyState -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.MetaKeyKeyListener.html#android.text.method.MetaKeyKeyListener.clearMetaKeyState_added(long, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>long, int</code>)</b>&nbsp;in&nbsp;android.text.method.MetaKeyKeyListener
+</A></nobr><br>
+<!-- Method clearMetaKeyState -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.MetaKeyKeyListener.html#android.text.method.MetaKeyKeyListener.clearMetaKeyState_added(android.view.View, android.text.Editable, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>View, Editable, int</code>)</b>&nbsp;in&nbsp;android.text.method.MetaKeyKeyListener
+</A></nobr><br>
+<!-- Method clearMetaKeyState -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.MetaKeyKeyListener.html#android.text.method.MetaKeyKeyListener.clearMetaKeyState_added(android.text.Editable, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Editable, int</code>)</b>&nbsp;in&nbsp;android.text.method.MetaKeyKeyListener
+</A></nobr><br>
+<!-- Method clearTestProviderEnabled -->
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.clearTestProviderEnabled_added(java.lang.String)" class="hiddenlink" target="rightframe"><b>clearTestProviderEnabled</b>
+(<code>String</code>)</A></nobr><br>
+<!-- Method clearTestProviderLocation -->
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.clearTestProviderLocation_added(java.lang.String)" class="hiddenlink" target="rightframe"><b>clearTestProviderLocation</b>
+(<code>String</code>)</A></nobr><br>
+<!-- Method clearTestProviderStatus -->
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.clearTestProviderStatus_added(java.lang.String)" class="hiddenlink" target="rightframe"><b>clearTestProviderStatus</b>
+(<code>String</code>)</A></nobr><br>
+<!-- Class ClickableSpan -->
+<A HREF="android.text.style.ClickableSpan.html" class="hiddenlink" target="rightframe">ClickableSpan</A><br>
+<!-- Field CLIP_HORIZONTAL -->
+<nobr><A HREF="android.view.Gravity.html#android.view.Gravity.CLIP_HORIZONTAL" class="hiddenlink" target="rightframe">CLIP_HORIZONTAL</A>
+</nobr><br>
+<!-- Field CLIP_VERTICAL -->
+<nobr><A HREF="android.view.Gravity.html#android.view.Gravity.CLIP_VERTICAL" class="hiddenlink" target="rightframe">CLIP_VERTICAL</A>
+</nobr><br>
+<!-- Method clone -->
+<nobr><A HREF="android.graphics.drawable.shapes.Shape.html#android.graphics.drawable.shapes.Shape.clone_changed()" class="hiddenlink" target="rightframe">clone
+()</A></nobr><br>
+<!-- Method close -->
+<nobr><A HREF="android.view.Menu.html#android.view.Menu.close_added()" class="hiddenlink" target="rightframe"><b>close</b>
+()</A></nobr><br>
+<!-- Field closeButton -->
+<nobr><A HREF="android.R.id.html#android.R.id.closeButton" class="hiddenlink" target="rightframe">closeButton</A>
+</nobr><br>
+<!-- Method closeContextMenu -->
+<nobr><A HREF="android.app.Activity.html#android.app.Activity.closeContextMenu_added()" class="hiddenlink" target="rightframe"><b>closeContextMenu</b>
+()</A></nobr><br>
+<!-- Field codes -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.codes" class="hiddenlink" target="rightframe">codes</A>
+</nobr><br>
+<!-- Method computeDurationHint -->
+<nobr><A HREF="android.view.animation.Animation.html#android.view.animation.Animation.computeDurationHint_added()" class="hiddenlink" target="rightframe"><b>computeDurationHint</b>
+()</A></nobr><br>
+<!-- Field configPreferences -->
+<nobr><A HREF="android.content.pm.PackageInfo.html#android.content.pm.PackageInfo.configPreferences" class="hiddenlink" target="rightframe">configPreferences</A>
+</nobr><br>
+<!-- Class Configuration -->
+<A HREF="android.content.res.Configuration.html" class="hiddenlink" target="rightframe">Configuration</A><br>
+<!-- Class ConfigurationInfo -->
+<A HREF="pkg_android.content.pm.html#ConfigurationInfo" class="hiddenlink" target="rightframe"><b>ConfigurationInfo</b></A><br>
+<!-- Field configure -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.configure" class="hiddenlink" target="rightframe">configure</A>
+</nobr><br>
+<!-- Class ConnectivityManager -->
+<A HREF="android.net.ConnectivityManager.html" class="hiddenlink" target="rightframe">ConnectivityManager</A><br>
+<!-- Class Contacts.Intents -->
+<A HREF="android.provider.Contacts.Intents.html" class="hiddenlink" target="rightframe">Contacts.Intents</A><br>
+<!-- Class Contacts.Intents.Insert -->
+<A HREF="android.provider.Contacts.Intents.Insert.html" class="hiddenlink" target="rightframe">Contacts.Intents.Insert</A><br>
+<!-- Class Contacts.PeopleColumns -->
+<A HREF="android.provider.Contacts.PeopleColumns.html" class="hiddenlink" target="rightframe"><i>Contacts.PeopleColumns</i></A><br>
+<!-- Field content -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.content" class="hiddenlink" target="rightframe">content</A>
+</nobr><br>
+<!-- Class ContentProvider -->
+<A HREF="android.content.ContentProvider.html" class="hiddenlink" target="rightframe">ContentProvider</A><br>
+<!-- Class ContentResolver -->
+<A HREF="android.content.ContentResolver.html" class="hiddenlink" target="rightframe">ContentResolver</A><br>
+<!-- Class Context -->
+<A HREF="android.content.Context.html" class="hiddenlink" target="rightframe">Context</A><br>
+<!-- Field copy -->
+<nobr><A HREF="android.R.id.html#android.R.id.copy" class="hiddenlink" target="rightframe">copy</A>
+</nobr><br>
+<!-- Method copyPixelsFromBuffer -->
+<nobr><A HREF="android.graphics.Bitmap.html#android.graphics.Bitmap.copyPixelsFromBuffer_added(java.nio.Buffer)" class="hiddenlink" target="rightframe"><b>copyPixelsFromBuffer</b>
+(<code>Buffer</code>)</A></nobr><br>
+<!-- Field copyUrl -->
+<nobr><A HREF="android.R.id.html#android.R.id.copyUrl" class="hiddenlink" target="rightframe">copyUrl</A>
+</nobr><br>
+<!-- Method createInputStream -->
+<nobr><A HREF="android.content.res.AssetFileDescriptor.html#android.content.res.AssetFileDescriptor.createInputStream_added()" class="hiddenlink" target="rightframe"><b>createInputStream</b>
+()</A></nobr><br>
+<!-- Method createOutputStream -->
+<nobr><A HREF="android.content.res.AssetFileDescriptor.html#android.content.res.AssetFileDescriptor.createOutputStream_added()" class="hiddenlink" target="rightframe"><b>createOutputStream</b>
+()</A></nobr><br>
+<!-- Method createWifiLock -->
+<nobr><A HREF="android.net.wifi.WifiManager.html#android.net.wifi.WifiManager.createWifiLock_added(int, java.lang.String)" class="hiddenlink" target="rightframe"><b>createWifiLock</b>
+(<code>int, String</code>)</A></nobr><br>
+<!-- Field CREATOR -->
+<i>CREATOR</i><br>
+&nbsp;in&nbsp;
+<nobr><A HREF="android.content.res.AssetFileDescriptor.html#android.content.res.AssetFileDescriptor.CREATOR" class="hiddenlink" target="rightframe">android.content.res.AssetFileDescriptor</A>
+</nobr><br>
+<!-- Field CREATOR -->
+&nbsp;in&nbsp;
+<nobr><A HREF="android.graphics.RectF.html#android.graphics.RectF.CREATOR" class="hiddenlink" target="rightframe">android.graphics.RectF</A>
+</nobr><br>
+<!-- Class Cursor -->
+<A HREF="android.database.Cursor.html" class="hiddenlink" target="rightframe"><i>Cursor</i></A><br>
+<!-- Class CursorAdapter -->
+<A HREF="android.widget.CursorAdapter.html" class="hiddenlink" target="rightframe">CursorAdapter</A><br>
+<!-- Class CursorWrapper -->
+<A HREF="android.database.CursorWrapper.html" class="hiddenlink" target="rightframe">CursorWrapper</A><br>
+<!-- Field cut -->
+<nobr><A HREF="android.R.id.html#android.R.id.cut" class="hiddenlink" target="rightframe">cut</A>
+</nobr><br>
+<!-- Package dalvik.system -->
+<A NAME="D"></A>
+<A HREF="pkg_dalvik.system.html" class="hiddenlink" target="rightframe">dalvik.system</A><br>
+<!-- Field dark_header -->
+<nobr><A HREF="android.R.drawable.html#android.R.drawable.dark_header" class="hiddenlink" target="rightframe">dark_header</A>
+</nobr><br>
+<!-- Field DATA_ROAMING -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.DATA_ROAMING" class="hiddenlink" target="rightframe">DATA_ROAMING</A>
+</nobr><br>
+<!-- Field DATA_X -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.DATA_X" class="hiddenlink" target="rightframe">DATA_X</A>
+</nobr><br>
+<!-- Field DATA_Y -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.DATA_Y" class="hiddenlink" target="rightframe">DATA_Y</A>
+</nobr><br>
+<!-- Field DATA_Z -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.DATA_Z" class="hiddenlink" target="rightframe">DATA_Z</A>
+</nobr><br>
+<!-- Class DatabaseUtils -->
+<A HREF="android.database.DatabaseUtils.html" class="hiddenlink" target="rightframe">DatabaseUtils</A><br>
+<!-- Class Date -->
+<i>Date</i><br>
+&nbsp;&nbsp;<A HREF="java.util.Date.html" class="hiddenlink" target="rightframe">java.util</A><br>
+<!-- Constructor Date -->
+&nbsp;&nbsp;<nobr><A HREF="java.util.Date.html#java.util.Date.ctor_changed()" class="hiddenlink" target="rightframe">Date
+()</A></nobr>&nbsp;constructor<br>
+<!-- Constructor Date -->
+&nbsp;&nbsp;<nobr><A HREF="java.util.Date.html#java.util.Date.ctor_changed(int, int, int, int, int, int)" class="hiddenlink" target="rightframe">Date
+(<code>int, int, int, int, int, int</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Class DateKeyListener -->
+<A HREF="android.text.method.DateKeyListener.html" class="hiddenlink" target="rightframe">DateKeyListener</A><br>
+<!-- Class DateTimeKeyListener -->
+<A HREF="android.text.method.DateTimeKeyListener.html" class="hiddenlink" target="rightframe">DateTimeKeyListener</A><br>
+<!-- Class Debug -->
+<A HREF="android.os.Debug.html" class="hiddenlink" target="rightframe">Debug</A><br>
+<!-- Field DEBUG_ENABLE_ASSERT -->
+<nobr><A HREF="dalvik.system.Zygote.html#dalvik.system.Zygote.DEBUG_ENABLE_ASSERT" class="hiddenlink" target="rightframe">DEBUG_ENABLE_ASSERT</A>
+</nobr><br>
+<!-- Field DEBUG_ENABLE_CHECKJNI -->
+<nobr><A HREF="dalvik.system.Zygote.html#dalvik.system.Zygote.DEBUG_ENABLE_CHECKJNI" class="hiddenlink" target="rightframe">DEBUG_ENABLE_CHECKJNI</A>
+</nobr><br>
+<!-- Field DEBUG_ENABLE_DEBUGGER -->
+<nobr><A HREF="dalvik.system.Zygote.html#dalvik.system.Zygote.DEBUG_ENABLE_DEBUGGER" class="hiddenlink" target="rightframe">DEBUG_ENABLE_DEBUGGER</A>
+</nobr><br>
+<!-- Field DEFAULT_SORT_ORDER -->
+<i>DEFAULT_SORT_ORDER</i><br>
+&nbsp;in&nbsp;
+<nobr><A HREF="android.provider.MediaStore.Images.Media.html#android.provider.MediaStore.Images.Media.DEFAULT_SORT_ORDER" class="hiddenlink" target="rightframe">android.provider.MediaStore.Images.Media</A>
+</nobr><br>
+<!-- Field DEFAULT_SORT_ORDER -->
+&nbsp;in&nbsp;
+<nobr><A HREF="android.provider.MediaStore.Video.html#android.provider.MediaStore.Video.DEFAULT_SORT_ORDER" class="hiddenlink" target="rightframe">android.provider.MediaStore.Video</A>
+</nobr><br>
+<!-- Method describeContents -->
+<i>describeContents</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.content.res.AssetFileDescriptor.html#android.content.res.AssetFileDescriptor.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.content.res.AssetFileDescriptor
+</A></nobr><br>
+<!-- Method describeContents -->
+&nbsp;&nbsp;<nobr><A HREF="android.graphics.RectF.html#android.graphics.RectF.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.graphics.RectF
+</A></nobr><br>
+<!-- Method describeContents -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.Annotation.html#android.text.Annotation.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.Annotation
+</A></nobr><br>
+<!-- Method describeContents -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.AbsoluteSizeSpan.html#android.text.style.AbsoluteSizeSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.AbsoluteSizeSpan
+</A></nobr><br>
+<!-- Method describeContents -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.AlignmentSpan.Standard.html#android.text.style.AlignmentSpan.Standard.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.AlignmentSpan.Standard
+</A></nobr><br>
+<!-- Method describeContents -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.BackgroundColorSpan.html#android.text.style.BackgroundColorSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.BackgroundColorSpan
+</A></nobr><br>
+<!-- Method describeContents -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.BulletSpan.html#android.text.style.BulletSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.BulletSpan
+</A></nobr><br>
+<!-- Method describeContents -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.ForegroundColorSpan.html#android.text.style.ForegroundColorSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.ForegroundColorSpan
+</A></nobr><br>
+<!-- Method describeContents -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.LeadingMarginSpan.Standard.html#android.text.style.LeadingMarginSpan.Standard.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.LeadingMarginSpan.Standard
+</A></nobr><br>
+<!-- Method describeContents -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.QuoteSpan.html#android.text.style.QuoteSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.QuoteSpan
+</A></nobr><br>
+<!-- Method describeContents -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.RelativeSizeSpan.html#android.text.style.RelativeSizeSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.RelativeSizeSpan
+</A></nobr><br>
+<!-- Method describeContents -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.ScaleXSpan.html#android.text.style.ScaleXSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.ScaleXSpan
+</A></nobr><br>
+<!-- Method describeContents -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.StrikethroughSpan.html#android.text.style.StrikethroughSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.StrikethroughSpan
+</A></nobr><br>
+<!-- Method describeContents -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.StyleSpan.html#android.text.style.StyleSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.StyleSpan
+</A></nobr><br>
+<!-- Method describeContents -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.SubscriptSpan.html#android.text.style.SubscriptSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.SubscriptSpan
+</A></nobr><br>
+<!-- Method describeContents -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.SuperscriptSpan.html#android.text.style.SuperscriptSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.SuperscriptSpan
+</A></nobr><br>
+<!-- Method describeContents -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.TextAppearanceSpan.html#android.text.style.TextAppearanceSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.TextAppearanceSpan
+</A></nobr><br>
+<!-- Method describeContents -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.TypefaceSpan.html#android.text.style.TypefaceSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.TypefaceSpan
+</A></nobr><br>
+<!-- Method describeContents -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.URLSpan.html#android.text.style.URLSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.URLSpan
+</A></nobr><br>
+<!-- Method describeContents -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.UnderlineSpan.html#android.text.style.UnderlineSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.UnderlineSpan
+</A></nobr><br>
+<!-- Field DEVICE_PROVISIONED -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.DEVICE_PROVISIONED" class="hiddenlink" target="rightframe">DEVICE_PROVISIONED</A>
+</nobr><br>
+<!-- Method deviceHasKey -->
+<nobr><A HREF="android.view.KeyCharacterMap.html#android.view.KeyCharacterMap.deviceHasKey_added(int)" class="hiddenlink" target="rightframe"><b>deviceHasKey</b>
+(<code>int</code>)</A></nobr><br>
+<!-- Method deviceHasKeys -->
+<nobr><A HREF="android.view.KeyCharacterMap.html#android.view.KeyCharacterMap.deviceHasKeys_added(int[])" class="hiddenlink" target="rightframe"><b>deviceHasKeys</b>
+(<code>int[]</code>)</A></nobr><br>
+<!-- Class DexClassLoader -->
+<A HREF="pkg_dalvik.system.html#DexClassLoader" class="hiddenlink" target="rightframe"><b>DexClassLoader</b></A><br>
+<!-- Class DexFile -->
+<A HREF="dalvik.system.DexFile.html" class="hiddenlink" target="rightframe">DexFile</A><br>
+<!-- Class DialerKeyListener -->
+<A HREF="android.text.method.DialerKeyListener.html" class="hiddenlink" target="rightframe">DialerKeyListener</A><br>
+<!-- Field dialog_alert_title -->
+<nobr><A HREF="android.R.string.html#android.R.string.dialog_alert_title" class="hiddenlink" target="rightframe">dialog_alert_title</A>
+</nobr><br>
+<!-- Class DialogInterface -->
+<A HREF="android.content.DialogInterface.html" class="hiddenlink" target="rightframe"><i>DialogInterface</i></A><br>
+<!-- Class DialogPreference -->
+<A HREF="android.preference.DialogPreference.html" class="hiddenlink" target="rightframe">DialogPreference</A><br>
+<!-- Method didTouchFocusSelect -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.didTouchFocusSelect_added()" class="hiddenlink" target="rightframe"><b>didTouchFocusSelect</b>
+()</A></nobr><br>
+<!-- Class DigitsKeyListener -->
+<A HREF="android.text.method.DigitsKeyListener.html" class="hiddenlink" target="rightframe">DigitsKeyListener</A><br>
+<!-- Method dispatchKeyEventPreIme -->
+<nobr><A HREF="android.view.View.html#android.view.View.dispatchKeyEventPreIme_added(android.view.KeyEvent)" class="hiddenlink" target="rightframe"><b>dispatchKeyEventPreIme</b>
+(<code>KeyEvent</code>)</A></nobr><br>
+<!-- Field DISPLAY -->
+<nobr><A HREF="android.os.Build.html#android.os.Build.DISPLAY" class="hiddenlink" target="rightframe">DISPLAY</A>
+</nobr><br>
+<!-- Field DISPLAY_CLIP_HORIZONTAL -->
+<nobr><A HREF="android.view.Gravity.html#android.view.Gravity.DISPLAY_CLIP_HORIZONTAL" class="hiddenlink" target="rightframe">DISPLAY_CLIP_HORIZONTAL</A>
+</nobr><br>
+<!-- Field DISPLAY_CLIP_VERTICAL -->
+<nobr><A HREF="android.view.Gravity.html#android.view.Gravity.DISPLAY_CLIP_VERTICAL" class="hiddenlink" target="rightframe">DISPLAY_CLIP_VERTICAL</A>
+</nobr><br>
+<!-- Method drag -->
+<i>drag</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.drag_added(android.test.InstrumentationTestCase, float, float, float, float, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>InstrumentationTestCase, float, float, float, float, int</code>)</b>&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+<!-- Method drag -->
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.drag_changed(android.test.ActivityInstrumentationTestCase, float, float, float, float, int)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>ActivityInstrumentationTestCase, float, float, float, float, int</code>)&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+<!-- Method dragQuarterScreenDown -->
+<i>dragQuarterScreenDown</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragQuarterScreenDown_added(android.test.InstrumentationTestCase, android.app.Activity)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>InstrumentationTestCase, Activity</code>)</b>&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+<!-- Method dragQuarterScreenDown -->
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragQuarterScreenDown_changed(android.test.ActivityInstrumentationTestCase)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>ActivityInstrumentationTestCase</code>)&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+<!-- Method dragQuarterScreenUp -->
+<i>dragQuarterScreenUp</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragQuarterScreenUp_added(android.test.InstrumentationTestCase, android.app.Activity)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>InstrumentationTestCase, Activity</code>)</b>&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+<!-- Method dragQuarterScreenUp -->
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragQuarterScreenUp_changed(android.test.ActivityInstrumentationTestCase)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>ActivityInstrumentationTestCase</code>)&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+<!-- Method dragViewBy -->
+<i>dragViewBy</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewBy_added(android.test.InstrumentationTestCase, android.view.View, int, int, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>InstrumentationTestCase, View, int, int, int</code>)</b>&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+<!-- Method dragViewBy -->
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewBy_changed(android.test.ActivityInstrumentationTestCase, android.view.View, int, int, int)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>ActivityInstrumentationTestCase, View, int, int, int</code>)&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+<!-- Method dragViewTo -->
+<i>dragViewTo</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewTo_added(android.test.InstrumentationTestCase, android.view.View, int, int, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>InstrumentationTestCase, View, int, int, int</code>)</b>&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+<!-- Method dragViewTo -->
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewTo_changed(android.test.ActivityInstrumentationTestCase, android.view.View, int, int, int)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>ActivityInstrumentationTestCase, View, int, int, int</code>)&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+<!-- Method dragViewToBottom -->
+<i>dragViewToBottom</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewToBottom_added(android.test.ActivityInstrumentationTestCase, android.view.View, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>ActivityInstrumentationTestCase, View, int</code>)</b>&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+<!-- Method dragViewToBottom -->
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewToBottom_added(android.test.InstrumentationTestCase, android.app.Activity, android.view.View, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>InstrumentationTestCase, Activity, View, int</code>)</b>&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+<!-- Method dragViewToBottom -->
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewToBottom_changed(android.test.ActivityInstrumentationTestCase, android.view.View)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>ActivityInstrumentationTestCase, View</code>)&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+<!-- Method dragViewToBottom -->
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewToBottom_changed(android.test.InstrumentationTestCase, android.app.Activity, android.view.View)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>InstrumentationTestCase, Activity, View</code>)&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+<!-- Method dragViewToTop -->
+<i>dragViewToTop</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewToTop_added(android.test.InstrumentationTestCase, android.view.View)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>InstrumentationTestCase, View</code>)</b>&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+<!-- Method dragViewToTop -->
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewToTop_added(android.test.InstrumentationTestCase, android.view.View, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>InstrumentationTestCase, View, int</code>)</b>&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+<!-- Method dragViewToTop -->
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewToTop_changed(android.test.ActivityInstrumentationTestCase, android.view.View)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>ActivityInstrumentationTestCase, View</code>)&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+<!-- Method dragViewToTop -->
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewToTop_changed(android.test.ActivityInstrumentationTestCase, android.view.View, int)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>ActivityInstrumentationTestCase, View, int</code>)&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+<!-- Method dragViewToX -->
+<i>dragViewToX</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewToX_added(android.test.InstrumentationTestCase, android.view.View, int, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>InstrumentationTestCase, View, int, int</code>)</b>&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+<!-- Method dragViewToX -->
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewToX_changed(android.test.ActivityInstrumentationTestCase, android.view.View, int, int)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>ActivityInstrumentationTestCase, View, int, int</code>)&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+<!-- Method dragViewToY -->
+<i>dragViewToY</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewToY_added(android.test.InstrumentationTestCase, android.view.View, int, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>InstrumentationTestCase, View, int, int</code>)</b>&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+<!-- Method dragViewToY -->
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewToY_changed(android.test.ActivityInstrumentationTestCase, android.view.View, int, int)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>ActivityInstrumentationTestCase, View, int, int</code>)&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+<!-- Class Drawable -->
+<A HREF="android.graphics.drawable.Drawable.html" class="hiddenlink" target="rightframe">Drawable</A><br>
+<!-- Method drawBitmap -->
+<nobr><A HREF="android.graphics.Canvas.html#android.graphics.Canvas.drawBitmap_added(int[], int, int, float, float, int, int, boolean, android.graphics.Paint)" class="hiddenlink" target="rightframe"><b>drawBitmap</b>
+(<code>int[], int, int, float, float, int, int, boolean, Paint</code>)</A></nobr><br>
+<!-- Field dropDownAnchor -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.dropDownAnchor" class="hiddenlink" target="rightframe">dropDownAnchor</A>
+</nobr><br>
+<!-- Field dropDownWidth -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.dropDownWidth" class="hiddenlink" target="rightframe">dropDownWidth</A>
+</nobr><br>
+<!-- Method dump -->
+<i>dump</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.location.Location.html#android.location.Location.dump_added(android.util.Printer, java.lang.String)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Printer, String</code>)</b>&nbsp;in&nbsp;android.location.Location
+</A></nobr><br>
+<!-- Method dump -->
+&nbsp;&nbsp;<nobr><A HREF="android.os.Binder.html#android.os.Binder.dump_added(java.io.FileDescriptor, java.lang.String[])" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>FileDescriptor, String[]</code>)</b>&nbsp;in&nbsp;android.os.Binder
+</A></nobr><br>
+<!-- Method dump -->
+&nbsp;&nbsp;<nobr><A HREF="android.os.IBinder.html#android.os.IBinder.dump_added(java.io.FileDescriptor, java.lang.String[])" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>FileDescriptor, String[]</code>)</b>&nbsp;in&nbsp;android.os.IBinder
+</A></nobr><br>
+<!-- Method dumpCapturedView -->
+<nobr><A HREF="android.view.ViewDebug.html#android.view.ViewDebug.dumpCapturedView_added(java.lang.String, java.lang.Object)" class="hiddenlink" target="rightframe"><b>dumpCapturedView</b>
+(<code>String, Object</code>)</A></nobr><br>
+<!-- Method dumpHprofData -->
+<i>dumpHprofData</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.os.Debug.html#android.os.Debug.dumpHprofData_added(java.lang.String)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>String</code>)</b>&nbsp;in&nbsp;android.os.Debug
+</A></nobr><br>
+<!-- Method dumpHprofData -->
+&nbsp;&nbsp;<nobr><A HREF="dalvik.system.VMDebug.html#dalvik.system.VMDebug.dumpHprofData_added(java.lang.String)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>String</code>)</b>&nbsp;in&nbsp;dalvik.system.VMDebug
+</A></nobr><br>
+<!-- Method dumpSpans -->
+<nobr><A HREF="android.text.TextUtils.html#android.text.TextUtils.dumpSpans_added(java.lang.CharSequence, android.util.Printer, java.lang.String)" class="hiddenlink" target="rightframe"><b>dumpSpans</b>
+(<code>CharSequence, Printer, String</code>)</A></nobr><br>
+<!-- Class DynamicDrawableSpan -->
+<i>DynamicDrawableSpan</i><br>
+&nbsp;&nbsp;<A HREF="android.text.style.DynamicDrawableSpan.html" class="hiddenlink" target="rightframe">android.text.style</A><br>
+<!-- Constructor DynamicDrawableSpan -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.DynamicDrawableSpan.html#android.text.style.DynamicDrawableSpan.ctor_added(int)" class="hiddenlink" target="rightframe"><b>DynamicDrawableSpan</b>
+(<code>int</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Field editable -->
+<A NAME="E"></A>
+<br><font size="+2">E</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.R.attr.html#android.R.attr.editable" class="hiddenlink" target="rightframe">editable</A>
+</nobr><br>
+<!-- Field editorExtras -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.editorExtras" class="hiddenlink" target="rightframe">editorExtras</A>
+</nobr><br>
+<!-- Field enabled -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.enabled" class="hiddenlink" target="rightframe">enabled</A>
+</nobr><br>
+<!-- Method endBatchEdit -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.endBatchEdit_added()" class="hiddenlink" target="rightframe"><b>endBatchEdit</b>
+()</A></nobr><br>
+<!-- Class Environment -->
+<A HREF="android.os.Environment.html" class="hiddenlink" target="rightframe">Environment</A><br>
+<!-- Field EXTRA_APPLICATION_ID -->
+<nobr><A HREF="android.provider.Browser.html#android.provider.Browser.EXTRA_APPLICATION_ID" class="hiddenlink" target="rightframe">EXTRA_APPLICATION_ID</A>
+</nobr><br>
+<!-- Field EXTRA_CREATE_DESCRIPTION -->
+<nobr><A HREF="android.provider.Contacts.Intents.html#android.provider.Contacts.Intents.EXTRA_CREATE_DESCRIPTION" class="hiddenlink" target="rightframe">EXTRA_CREATE_DESCRIPTION</A>
+</nobr><br>
+<!-- Field EXTRA_DATA_REMOVED -->
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.EXTRA_DATA_REMOVED" class="hiddenlink" target="rightframe">EXTRA_DATA_REMOVED</A>
+</nobr><br>
+<!-- Field EXTRA_FINISH_ON_COMPLETION -->
+<nobr><A HREF="android.provider.MediaStore.html#android.provider.MediaStore.EXTRA_FINISH_ON_COMPLETION" class="hiddenlink" target="rightframe">EXTRA_FINISH_ON_COMPLETION</A>
+</nobr><br>
+<!-- Field EXTRA_FORCE_CREATE -->
+<nobr><A HREF="android.provider.Contacts.Intents.html#android.provider.Contacts.Intents.EXTRA_FORCE_CREATE" class="hiddenlink" target="rightframe">EXTRA_FORCE_CREATE</A>
+</nobr><br>
+<!-- Field EXTRA_INCOMING_NUMBER -->
+<nobr><A HREF="android.telephony.TelephonyManager.html#android.telephony.TelephonyManager.EXTRA_INCOMING_NUMBER" class="hiddenlink" target="rightframe">EXTRA_INCOMING_NUMBER</A>
+</nobr><br>
+<!-- Field EXTRA_MAX_BYTES -->
+<nobr><A HREF="android.provider.MediaStore.Audio.Media.html#android.provider.MediaStore.Audio.Media.EXTRA_MAX_BYTES" class="hiddenlink" target="rightframe">EXTRA_MAX_BYTES</A>
+</nobr><br>
+<!-- Field EXTRA_MEDIA_ALBUM -->
+<nobr><A HREF="android.provider.MediaStore.html#android.provider.MediaStore.EXTRA_MEDIA_ALBUM" class="hiddenlink" target="rightframe">EXTRA_MEDIA_ALBUM</A>
+</nobr><br>
+<!-- Field EXTRA_MEDIA_ARTIST -->
+<nobr><A HREF="android.provider.MediaStore.html#android.provider.MediaStore.EXTRA_MEDIA_ARTIST" class="hiddenlink" target="rightframe">EXTRA_MEDIA_ARTIST</A>
+</nobr><br>
+<!-- Field EXTRA_MEDIA_FOCUS -->
+<nobr><A HREF="android.provider.MediaStore.html#android.provider.MediaStore.EXTRA_MEDIA_FOCUS" class="hiddenlink" target="rightframe">EXTRA_MEDIA_FOCUS</A>
+</nobr><br>
+<!-- Field EXTRA_MEDIA_TITLE -->
+<nobr><A HREF="android.provider.MediaStore.html#android.provider.MediaStore.EXTRA_MEDIA_TITLE" class="hiddenlink" target="rightframe">EXTRA_MEDIA_TITLE</A>
+</nobr><br>
+<!-- Field EXTRA_OUTPUT -->
+<nobr><A HREF="android.provider.MediaStore.html#android.provider.MediaStore.EXTRA_OUTPUT" class="hiddenlink" target="rightframe">EXTRA_OUTPUT</A>
+</nobr><br>
+<!-- Field EXTRA_REPLACING -->
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.EXTRA_REPLACING" class="hiddenlink" target="rightframe">EXTRA_REPLACING</A>
+</nobr><br>
+<!-- Field EXTRA_SCREEN_ORIENTATION -->
+<nobr><A HREF="android.provider.MediaStore.html#android.provider.MediaStore.EXTRA_SCREEN_ORIENTATION" class="hiddenlink" target="rightframe">EXTRA_SCREEN_ORIENTATION</A>
+</nobr><br>
+<!-- Field EXTRA_STATE -->
+<nobr><A HREF="android.telephony.TelephonyManager.html#android.telephony.TelephonyManager.EXTRA_STATE" class="hiddenlink" target="rightframe">EXTRA_STATE</A>
+</nobr><br>
+<!-- Field EXTRA_STATE_IDLE -->
+<nobr><A HREF="android.telephony.TelephonyManager.html#android.telephony.TelephonyManager.EXTRA_STATE_IDLE" class="hiddenlink" target="rightframe">EXTRA_STATE_IDLE</A>
+</nobr><br>
+<!-- Field EXTRA_STATE_OFFHOOK -->
+<nobr><A HREF="android.telephony.TelephonyManager.html#android.telephony.TelephonyManager.EXTRA_STATE_OFFHOOK" class="hiddenlink" target="rightframe">EXTRA_STATE_OFFHOOK</A>
+</nobr><br>
+<!-- Field EXTRA_STATE_RINGING -->
+<nobr><A HREF="android.telephony.TelephonyManager.html#android.telephony.TelephonyManager.EXTRA_STATE_RINGING" class="hiddenlink" target="rightframe">EXTRA_STATE_RINGING</A>
+</nobr><br>
+<!-- Field EXTRA_VIDEO_QUALITY -->
+<nobr><A HREF="android.provider.MediaStore.html#android.provider.MediaStore.EXTRA_VIDEO_QUALITY" class="hiddenlink" target="rightframe">EXTRA_VIDEO_QUALITY</A>
+</nobr><br>
+<!-- Field extractArea -->
+<nobr><A HREF="android.R.id.html#android.R.id.extractArea" class="hiddenlink" target="rightframe">extractArea</A>
+</nobr><br>
+<!-- Method extractText -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.extractText_added(android.view.inputmethod.ExtractedTextRequest, android.view.inputmethod.ExtractedText)" class="hiddenlink" target="rightframe"><b>extractText</b>
+(<code>ExtractedTextRequest, ExtractedText</code>)</A></nobr><br>
+<!-- Field fastScrollEnabled -->
+<A NAME="F"></A>
+<br><font size="+2">F</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.R.attr.html#android.R.attr.fastScrollEnabled" class="hiddenlink" target="rightframe">fastScrollEnabled</A>
+</nobr><br>
+<!-- Field fillEnabled -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.fillEnabled" class="hiddenlink" target="rightframe">fillEnabled</A>
+</nobr><br>
+<!-- Method findAll -->
+<nobr><A HREF="android.webkit.WebView.html#android.webkit.WebView.findAll_added(java.lang.String)" class="hiddenlink" target="rightframe"><b>findAll</b>
+(<code>String</code>)</A></nobr><br>
+<!-- Method findNext -->
+<nobr><A HREF="android.webkit.WebView.html#android.webkit.WebView.findNext_added(boolean)" class="hiddenlink" target="rightframe"><b>findNext</b>
+(<code>boolean</code>)</A></nobr><br>
+<!-- Field FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET -->
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET" class="hiddenlink" target="rightframe">FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET</A>
+</nobr><br>
+<!-- Field FLAG_ACTIVITY_NO_USER_ACTION -->
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.FLAG_ACTIVITY_NO_USER_ACTION" class="hiddenlink" target="rightframe">FLAG_ACTIVITY_NO_USER_ACTION</A>
+</nobr><br>
+<!-- Field FLAG_ACTIVITY_REORDER_TO_FRONT -->
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.FLAG_ACTIVITY_REORDER_TO_FRONT" class="hiddenlink" target="rightframe">FLAG_ACTIVITY_REORDER_TO_FRONT</A>
+</nobr><br>
+<!-- Field FLAG_ALT_FOCUSABLE_IM -->
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM" class="hiddenlink" target="rightframe">FLAG_ALT_FOCUSABLE_IM</A>
+</nobr><br>
+<!-- Field FLAG_EDITOR_ACTION -->
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.FLAG_EDITOR_ACTION" class="hiddenlink" target="rightframe">FLAG_EDITOR_ACTION</A>
+</nobr><br>
+<!-- Field FLAG_FROM_SYSTEM -->
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.FLAG_FROM_SYSTEM" class="hiddenlink" target="rightframe">FLAG_FROM_SYSTEM</A>
+</nobr><br>
+<!-- Field FLAG_KEEP_TOUCH_MODE -->
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.FLAG_KEEP_TOUCH_MODE" class="hiddenlink" target="rightframe">FLAG_KEEP_TOUCH_MODE</A>
+</nobr><br>
+<!-- Field FLAG_NO_HISTORY -->
+<nobr><A HREF="android.content.pm.ActivityInfo.html#android.content.pm.ActivityInfo.FLAG_NO_HISTORY" class="hiddenlink" target="rightframe">FLAG_NO_HISTORY</A>
+</nobr><br>
+<!-- Field FLAG_SOFT_KEYBOARD -->
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.FLAG_SOFT_KEYBOARD" class="hiddenlink" target="rightframe">FLAG_SOFT_KEYBOARD</A>
+</nobr><br>
+<!-- Field FLAG_UPDATE_CURRENT -->
+<nobr><A HREF="android.app.PendingIntent.html#android.app.PendingIntent.FLAG_UPDATE_CURRENT" class="hiddenlink" target="rightframe">FLAG_UPDATE_CURRENT</A>
+</nobr><br>
+<!-- Field FLAG_WATCH_OUTSIDE_TOUCH -->
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH" class="hiddenlink" target="rightframe">FLAG_WATCH_OUTSIDE_TOUCH</A>
+</nobr><br>
+<!-- Field footerDividersEnabled -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.footerDividersEnabled" class="hiddenlink" target="rightframe">footerDividersEnabled</A>
+</nobr><br>
+<!-- Class ForegroundColorSpan -->
+<i>ForegroundColorSpan</i><br>
+&nbsp;&nbsp;<A HREF="android.text.style.ForegroundColorSpan.html" class="hiddenlink" target="rightframe">android.text.style</A><br>
+<!-- Constructor ForegroundColorSpan -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.ForegroundColorSpan.html#android.text.style.ForegroundColorSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>ForegroundColorSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Method forkAndSpecialize -->
+<i>forkAndSpecialize</i><br>
+&nbsp;&nbsp;<nobr><A HREF="dalvik.system.Zygote.html#dalvik.system.Zygote.forkAndSpecialize_added(int, int, int[], int, int[][])" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>int, int, int[], int, int[][]</code>)</b>&nbsp;in&nbsp;dalvik.system.Zygote
+</A></nobr><br>
+<!-- Method forkAndSpecialize -->
+&nbsp;&nbsp;<nobr><A HREF="dalvik.system.Zygote.html#dalvik.system.Zygote.forkAndSpecialize_changed(int, int, int[], boolean, int[][])" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>int, int, int[], boolean, int[][]</code>)&nbsp;in&nbsp;dalvik.system.Zygote
+</A></nobr><br>
+<!-- Method forkSystemServer -->
+<i>forkSystemServer</i><br>
+&nbsp;&nbsp;<nobr><A HREF="dalvik.system.Zygote.html#dalvik.system.Zygote.forkSystemServer_added(int, int, int[], int, int[][])" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>int, int, int[], int, int[][]</code>)</b>&nbsp;in&nbsp;dalvik.system.Zygote
+</A></nobr><br>
+<!-- Method forkSystemServer -->
+&nbsp;&nbsp;<nobr><A HREF="dalvik.system.Zygote.html#dalvik.system.Zygote.forkSystemServer_changed(int, int, int[], boolean, int[][])" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>int, int, int[], boolean, int[][]</code>)&nbsp;in&nbsp;dalvik.system.Zygote
+</A></nobr><br>
+<!-- Field FORMAT_JAPAN -->
+<nobr><A HREF="android.telephony.PhoneNumberUtils.html#android.telephony.PhoneNumberUtils.FORMAT_JAPAN" class="hiddenlink" target="rightframe">FORMAT_JAPAN</A>
+</nobr><br>
+<!-- Method formatJapaneseNumber -->
+<nobr><A HREF="android.telephony.PhoneNumberUtils.html#android.telephony.PhoneNumberUtils.formatJapaneseNumber_added(android.text.Editable)" class="hiddenlink" target="rightframe"><b>formatJapaneseNumber</b>
+(<code>Editable</code>)</A></nobr><br>
+<!-- Method forName -->
+<nobr><A HREF="java.lang.Character.UnicodeBlock.html#java.lang.Character.UnicodeBlock.forName_changed(java.lang.String)" class="hiddenlink" target="rightframe">forName
+(<code>String</code>)</A></nobr><br>
+<!-- Field FX_KEYPRESS_DELETE -->
+<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.FX_KEYPRESS_DELETE" class="hiddenlink" target="rightframe">FX_KEYPRESS_DELETE</A>
+</nobr><br>
+<!-- Field FX_KEYPRESS_RETURN -->
+<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.FX_KEYPRESS_RETURN" class="hiddenlink" target="rightframe">FX_KEYPRESS_RETURN</A>
+</nobr><br>
+<!-- Field FX_KEYPRESS_SPACEBAR -->
+<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.FX_KEYPRESS_SPACEBAR" class="hiddenlink" target="rightframe">FX_KEYPRESS_SPACEBAR</A>
+</nobr><br>
+<!-- Field FX_KEYPRESS_STANDARD -->
+<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.FX_KEYPRESS_STANDARD" class="hiddenlink" target="rightframe">FX_KEYPRESS_STANDARD</A>
+</nobr><br>
+<!-- Class GeomagneticField -->
+<A NAME="G"></A>
+<br><font size="+2">G</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="pkg_android.hardware.html#GeomagneticField" class="hiddenlink" target="rightframe"><b>GeomagneticField</b></A><br>
+<!-- Class GestureDetector -->
+<i>GestureDetector</i><br>
+&nbsp;&nbsp;<A HREF="android.view.GestureDetector.html" class="hiddenlink" target="rightframe">android.view</A><br>
+<!-- Constructor GestureDetector -->
+&nbsp;&nbsp;<nobr><A HREF="android.view.GestureDetector.html#android.view.GestureDetector.ctor_added(android.content.Context, android.view.GestureDetector.OnGestureListener)" class="hiddenlink" target="rightframe"><b>GestureDetector</b>
+(<code>Context, OnGestureListener</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Constructor GestureDetector -->
+&nbsp;&nbsp;<nobr><A HREF="android.view.GestureDetector.html#android.view.GestureDetector.ctor_added(android.content.Context, android.view.GestureDetector.OnGestureListener, android.os.Handler)" class="hiddenlink" target="rightframe"><b>GestureDetector</b>
+(<code>Context, OnGestureListener, Handler</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Constructor GestureDetector -->
+&nbsp;&nbsp;<nobr><A HREF="android.view.GestureDetector.html#android.view.GestureDetector.ctor_changed(android.view.GestureDetector.OnGestureListener)" class="hiddenlink" target="rightframe">GestureDetector
+(<code>OnGestureListener</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Constructor GestureDetector -->
+&nbsp;&nbsp;<nobr><A HREF="android.view.GestureDetector.html#android.view.GestureDetector.ctor_changed(android.view.GestureDetector.OnGestureListener, android.os.Handler)" class="hiddenlink" target="rightframe">GestureDetector
+(<code>OnGestureListener, Handler</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Class GestureDetector.OnDoubleTapListener -->
+<A HREF="pkg_android.view.html#GestureDetector.OnDoubleTapListener" class="hiddenlink" target="rightframe"><b><i>GestureDetector.OnDoubleTapListener</i></b></A><br>
+<!-- Class GestureDetector.SimpleOnGestureListener -->
+<A HREF="android.view.GestureDetector.SimpleOnGestureListener.html" class="hiddenlink" target="rightframe">GestureDetector.SimpleOnGestureListener</A><br>
+<!-- Method get -->
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.get_added(android.content.Context)" class="hiddenlink" target="rightframe"><b>get</b>
+(<code>Context</code>)</A></nobr><br>
+<!-- Field GET_CONFIGURATIONS -->
+<nobr><A HREF="android.content.pm.PackageManager.html#android.content.pm.PackageManager.GET_CONFIGURATIONS" class="hiddenlink" target="rightframe">GET_CONFIGURATIONS</A>
+</nobr><br>
+<!-- Field GET_UNINSTALLED_PACKAGES -->
+<nobr><A HREF="android.content.pm.PackageManager.html#android.content.pm.PackageManager.GET_UNINSTALLED_PACKAGES" class="hiddenlink" target="rightframe">GET_UNINSTALLED_PACKAGES</A>
+</nobr><br>
+<!-- Method getAllowFileAccess -->
+<nobr><A HREF="android.webkit.WebSettings.html#android.webkit.WebSettings.getAllowFileAccess_added()" class="hiddenlink" target="rightframe"><b>getAllowFileAccess</b>
+()</A></nobr><br>
+<!-- Method getBackgroundDataSetting -->
+<nobr><A HREF="android.net.ConnectivityManager.html#android.net.ConnectivityManager.getBackgroundDataSetting_added()" class="hiddenlink" target="rightframe"><b>getBackgroundDataSetting</b>
+()</A></nobr><br>
+<!-- Method getBoolean -->
+<nobr><A HREF="android.content.res.Resources.html#android.content.res.Resources.getBoolean_added(int)" class="hiddenlink" target="rightframe"><b>getBoolean</b>
+(<code>int</code>)</A></nobr><br>
+<!-- Method getBuiltInZoomControls -->
+<nobr><A HREF="android.webkit.WebSettings.html#android.webkit.WebSettings.getBuiltInZoomControls_added()" class="hiddenlink" target="rightframe"><b>getBuiltInZoomControls</b>
+()</A></nobr><br>
+<!-- Method getButton -->
+<nobr><A HREF="android.app.AlertDialog.html#android.app.AlertDialog.getButton_added(int)" class="hiddenlink" target="rightframe"><b>getButton</b>
+(<code>int</code>)</A></nobr><br>
+<!-- Method getCapsMode -->
+<nobr><A HREF="android.text.TextUtils.html#android.text.TextUtils.getCapsMode_added(java.lang.CharSequence, int, int)" class="hiddenlink" target="rightframe"><b>getCapsMode</b>
+(<code>CharSequence, int, int</code>)</A></nobr><br>
+<!-- Method getCharacters -->
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.getCharacters_added()" class="hiddenlink" target="rightframe"><b>getCharacters</b>
+()</A></nobr><br>
+<!-- Method getClasses -->
+<nobr><A HREF="java.lang.Class.html#java.lang.Class.getClasses_changed()" class="hiddenlink" target="rightframe">getClasses
+()</A></nobr><br>
+<!-- Method getColumnIndex -->
+<i>getColumnIndex</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.database.Cursor.html#android.database.Cursor.getColumnIndex_changed(java.lang.String)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>String</code>)&nbsp;in&nbsp;android.database.Cursor
+</A></nobr><br>
+<!-- Method getColumnIndex -->
+&nbsp;&nbsp;<nobr><A HREF="android.database.CursorWrapper.html#android.database.CursorWrapper.getColumnIndex_changed(java.lang.String)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>String</code>)&nbsp;in&nbsp;android.database.CursorWrapper
+</A></nobr><br>
+<!-- Method getConstructors -->
+<nobr><A HREF="java.lang.Class.html#java.lang.Class.getConstructors_changed()" class="hiddenlink" target="rightframe">getConstructors
+()</A></nobr><br>
+<!-- Method getCount -->
+<nobr><A HREF="android.widget.CursorAdapter.html#android.widget.CursorAdapter.getCount_changed()" class="hiddenlink" target="rightframe">getCount
+()</A></nobr><br>
+<!-- Method getDeclaredClasses -->
+<nobr><A HREF="java.lang.Class.html#java.lang.Class.getDeclaredClasses_changed()" class="hiddenlink" target="rightframe">getDeclaredClasses
+()</A></nobr><br>
+<!-- Method getDeclaredConstructors -->
+<nobr><A HREF="java.lang.Class.html#java.lang.Class.getDeclaredConstructors_changed()" class="hiddenlink" target="rightframe">getDeclaredConstructors
+()</A></nobr><br>
+<!-- Method getDeclaredLength -->
+<nobr><A HREF="android.content.res.AssetFileDescriptor.html#android.content.res.AssetFileDescriptor.getDeclaredLength_added()" class="hiddenlink" target="rightframe"><b>getDeclaredLength</b>
+()</A></nobr><br>
+<!-- Method getDefaultSensor -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.getDefaultSensor_added(int)" class="hiddenlink" target="rightframe"><b>getDefaultSensor</b>
+(<code>int</code>)</A></nobr><br>
+<!-- Method getDeviceConfigurationInfo -->
+<nobr><A HREF="android.app.ActivityManager.html#android.app.ActivityManager.getDeviceConfigurationInfo_added()" class="hiddenlink" target="rightframe"><b>getDeviceConfigurationInfo</b>
+()</A></nobr><br>
+<!-- Method getDialog -->
+<nobr><A HREF="android.preference.DialogPreference.html#android.preference.DialogPreference.getDialog_added()" class="hiddenlink" target="rightframe"><b>getDialog</b>
+()</A></nobr><br>
+<!-- Method getDoubleTapTimeout -->
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getDoubleTapTimeout_added()" class="hiddenlink" target="rightframe"><b>getDoubleTapTimeout</b>
+()</A></nobr><br>
+<!-- Method getDrawable -->
+<i>getDrawable</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.graphics.drawable.RotateDrawable.html#android.graphics.drawable.RotateDrawable.getDrawable_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.graphics.drawable.RotateDrawable
+</A></nobr><br>
+<!-- Method getDrawable -->
+&nbsp;&nbsp;<nobr><A HREF="android.graphics.drawable.ScaleDrawable.html#android.graphics.drawable.ScaleDrawable.getDrawable_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.graphics.drawable.ScaleDrawable
+</A></nobr><br>
+<!-- Method getDropDownAnchor -->
+<nobr><A HREF="android.widget.AutoCompleteTextView.html#android.widget.AutoCompleteTextView.getDropDownAnchor_added()" class="hiddenlink" target="rightframe"><b>getDropDownAnchor</b>
+()</A></nobr><br>
+<!-- Method getDropDownWidth -->
+<nobr><A HREF="android.widget.AutoCompleteTextView.html#android.widget.AutoCompleteTextView.getDropDownWidth_added()" class="hiddenlink" target="rightframe"><b>getDropDownWidth</b>
+()</A></nobr><br>
+<!-- Method getEdgeSlop -->
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getEdgeSlop_changed()" class="hiddenlink" target="rightframe">getEdgeSlop
+()</A></nobr><br>
+<!-- Method getEditableText -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.getEditableText_added()" class="hiddenlink" target="rightframe"><b>getEditableText</b>
+()</A></nobr><br>
+<!-- Method getFadingEdgeLength -->
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getFadingEdgeLength_changed()" class="hiddenlink" target="rightframe">getFadingEdgeLength
+()</A></nobr><br>
+<!-- Method getFraction -->
+<nobr><A HREF="android.content.res.Resources.html#android.content.res.Resources.getFraction_added(int, int, int)" class="hiddenlink" target="rightframe"><b>getFraction</b>
+(<code>int, int, int</code>)</A></nobr><br>
+<!-- Method getGpsStatus -->
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.getGpsStatus_added(android.location.GpsStatus)" class="hiddenlink" target="rightframe"><b>getGpsStatus</b>
+(<code>GpsStatus</code>)</A></nobr><br>
+<!-- Method getHandler -->
+<nobr><A HREF="android.view.View.html#android.view.View.getHandler_changed()" class="hiddenlink" target="rightframe">getHandler
+()</A></nobr><br>
+<!-- Method getImeActionId -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.getImeActionId_added()" class="hiddenlink" target="rightframe"><b>getImeActionId</b>
+()</A></nobr><br>
+<!-- Method getImeActionLabel -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.getImeActionLabel_added()" class="hiddenlink" target="rightframe"><b>getImeActionLabel</b>
+()</A></nobr><br>
+<!-- Method getImeOptions -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.getImeOptions_added()" class="hiddenlink" target="rightframe"><b>getImeOptions</b>
+()</A></nobr><br>
+<!-- Method getInclination -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.getInclination_added(float[])" class="hiddenlink" target="rightframe"><b>getInclination</b>
+(<code>float[]</code>)</A></nobr><br>
+<!-- Method getInitialScrollX -->
+<nobr><A HREF="android.text.method.Touch.html#android.text.method.Touch.getInitialScrollX_added(android.widget.TextView, android.text.Spannable)" class="hiddenlink" target="rightframe"><b>getInitialScrollX</b>
+(<code>TextView, Spannable</code>)</A></nobr><br>
+<!-- Method getInitialScrollY -->
+<nobr><A HREF="android.text.method.Touch.html#android.text.method.Touch.getInitialScrollY_added(android.widget.TextView, android.text.Spannable)" class="hiddenlink" target="rightframe"><b>getInitialScrollY</b>
+(<code>TextView, Spannable</code>)</A></nobr><br>
+<!-- Method getInputExtras -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.getInputExtras_added(boolean)" class="hiddenlink" target="rightframe"><b>getInputExtras</b>
+(<code>boolean</code>)</A></nobr><br>
+<!-- Method getInputMethodMode -->
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.getInputMethodMode_added()" class="hiddenlink" target="rightframe"><b>getInputMethodMode</b>
+()</A></nobr><br>
+<!-- Method getInputType -->
+<i>getInputType</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.DateKeyListener.html#android.text.method.DateKeyListener.getInputType_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.method.DateKeyListener
+</A></nobr><br>
+<!-- Method getInputType -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.DateTimeKeyListener.html#android.text.method.DateTimeKeyListener.getInputType_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.method.DateTimeKeyListener
+</A></nobr><br>
+<!-- Method getInputType -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.DialerKeyListener.html#android.text.method.DialerKeyListener.getInputType_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.method.DialerKeyListener
+</A></nobr><br>
+<!-- Method getInputType -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.DigitsKeyListener.html#android.text.method.DigitsKeyListener.getInputType_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.method.DigitsKeyListener
+</A></nobr><br>
+<!-- Method getInputType -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.KeyListener.html#android.text.method.KeyListener.getInputType_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.method.KeyListener
+</A></nobr><br>
+<!-- Method getInputType -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.MultiTapKeyListener.html#android.text.method.MultiTapKeyListener.getInputType_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.method.MultiTapKeyListener
+</A></nobr><br>
+<!-- Method getInputType -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.QwertyKeyListener.html#android.text.method.QwertyKeyListener.getInputType_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.method.QwertyKeyListener
+</A></nobr><br>
+<!-- Method getInputType -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.TextKeyListener.html#android.text.method.TextKeyListener.getInputType_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.method.TextKeyListener
+</A></nobr><br>
+<!-- Method getInputType -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.TimeKeyListener.html#android.text.method.TimeKeyListener.getInputType_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.method.TimeKeyListener
+</A></nobr><br>
+<!-- Method getInputType -->
+&nbsp;&nbsp;<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.getInputType_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.widget.TextView
+</A></nobr><br>
+<!-- Method getInterfaces -->
+<nobr><A HREF="java.lang.Class.html#java.lang.Class.getInterfaces_changed()" class="hiddenlink" target="rightframe">getInterfaces
+()</A></nobr><br>
+<!-- Method getItem -->
+<i>getItem</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.view.Menu.html#android.view.Menu.getItem_added(int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>int</code>)</b>&nbsp;in&nbsp;android.view.Menu
+</A></nobr><br>
+<!-- Method getItem -->
+&nbsp;&nbsp;<nobr><A HREF="android.widget.CursorAdapter.html#android.widget.CursorAdapter.getItem_changed(int)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>int</code>)&nbsp;in&nbsp;android.widget.CursorAdapter
+</A></nobr><br>
+<!-- Method getItemClickListener -->
+<nobr><A HREF="android.widget.AutoCompleteTextView.html#android.widget.AutoCompleteTextView.getItemClickListener_changed()" class="hiddenlink" target="rightframe">getItemClickListener
+()</A></nobr><br>
+<!-- Method getItemId -->
+<nobr><A HREF="android.widget.CursorAdapter.html#android.widget.CursorAdapter.getItemId_changed(int)" class="hiddenlink" target="rightframe">getItemId
+(<code>int</code>)</A></nobr><br>
+<!-- Method getItemSelectedListener -->
+<nobr><A HREF="android.widget.AutoCompleteTextView.html#android.widget.AutoCompleteTextView.getItemSelectedListener_changed()" class="hiddenlink" target="rightframe">getItemSelectedListener
+()</A></nobr><br>
+<!-- Method getKeyProgressIncrement -->
+<nobr><A HREF="android.widget.AbsSeekBar.html#android.widget.AbsSeekBar.getKeyProgressIncrement_added()" class="hiddenlink" target="rightframe"><b>getKeyProgressIncrement</b>
+()</A></nobr><br>
+<!-- Method getLaunchIntentForPackage -->
+<i>getLaunchIntentForPackage</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.content.pm.PackageManager.html#android.content.pm.PackageManager.getLaunchIntentForPackage_added(java.lang.String)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>String</code>)</b>&nbsp;in&nbsp;android.content.pm.PackageManager
+</A></nobr><br>
+<!-- Method getLaunchIntentForPackage -->
+&nbsp;&nbsp;<nobr><A HREF="android.test.mock.MockPackageManager.html#android.test.mock.MockPackageManager.getLaunchIntentForPackage_added(java.lang.String)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>String</code>)</b>&nbsp;in&nbsp;android.test.mock.MockPackageManager
+</A></nobr><br>
+<!-- Method getLayoutDimension -->
+<nobr><A HREF="android.content.res.TypedArray.html#android.content.res.TypedArray.getLayoutDimension_added(int, int)" class="hiddenlink" target="rightframe"><b>getLayoutDimension</b>
+(<code>int, int</code>)</A></nobr><br>
+<!-- Method getListSelection -->
+<nobr><A HREF="android.widget.AutoCompleteTextView.html#android.widget.AutoCompleteTextView.getListSelection_added()" class="hiddenlink" target="rightframe"><b>getListSelection</b>
+()</A></nobr><br>
+<!-- Method getListView -->
+<nobr><A HREF="android.app.AlertDialog.html#android.app.AlertDialog.getListView_added()" class="hiddenlink" target="rightframe"><b>getListView</b>
+()</A></nobr><br>
+<!-- Method getLoggingMXBean -->
+<nobr><A HREF="java.util.logging.LogManager.html#java.util.logging.LogManager.getLoggingMXBean_added()" class="hiddenlink" target="rightframe"><b>getLoggingMXBean</b>
+()</A></nobr><br>
+<!-- Method getLong -->
+<i>getLong</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.getLong_added(android.content.ContentResolver, java.lang.String)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>ContentResolver, String</code>)</b>&nbsp;in&nbsp;android.provider.Settings.System
+</A></nobr><br>
+<!-- Method getLong -->
+&nbsp;&nbsp;<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.getLong_added(android.content.ContentResolver, java.lang.String, long)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>ContentResolver, String, long</code>)</b>&nbsp;in&nbsp;android.provider.Settings.System
+</A></nobr><br>
+<!-- Method getMaxAvailableHeight -->
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.getMaxAvailableHeight_added(android.view.View, int)" class="hiddenlink" target="rightframe"><b>getMaxAvailableHeight</b>
+(<code>View, int</code>)</A></nobr><br>
+<!-- Method getMaximumDrawingCacheSize -->
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getMaximumDrawingCacheSize_changed()" class="hiddenlink" target="rightframe">getMaximumDrawingCacheSize
+()</A></nobr><br>
+<!-- Method getMaxKeyCode -->
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.getMaxKeyCode_added()" class="hiddenlink" target="rightframe"><b>getMaxKeyCode</b>
+()</A></nobr><br>
+<!-- Method getMetaState -->
+<i>getMetaState</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.MetaKeyKeyListener.html#android.text.method.MetaKeyKeyListener.getMetaState_added(long)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>long</code>)</b>&nbsp;in&nbsp;android.text.method.MetaKeyKeyListener
+</A></nobr><br>
+<!-- Method getMetaState -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.MetaKeyKeyListener.html#android.text.method.MetaKeyKeyListener.getMetaState_added(long, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>long, int</code>)</b>&nbsp;in&nbsp;android.text.method.MetaKeyKeyListener
+</A></nobr><br>
+<!-- Method getMinimumFlingVelocity -->
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getMinimumFlingVelocity_changed()" class="hiddenlink" target="rightframe">getMinimumFlingVelocity
+()</A></nobr><br>
+<!-- Method getNeighboringCellInfo -->
+<nobr><A HREF="android.telephony.TelephonyManager.html#android.telephony.TelephonyManager.getNeighboringCellInfo_added()" class="hiddenlink" target="rightframe"><b>getNeighboringCellInfo</b>
+()</A></nobr><br>
+<!-- Method getOnChronometerTickListener -->
+<nobr><A HREF="android.widget.Chronometer.html#android.widget.Chronometer.getOnChronometerTickListener_added()" class="hiddenlink" target="rightframe"><b>getOnChronometerTickListener</b>
+()</A></nobr><br>
+<!-- Method getOnItemClickListener -->
+<nobr><A HREF="android.widget.AutoCompleteTextView.html#android.widget.AutoCompleteTextView.getOnItemClickListener_added()" class="hiddenlink" target="rightframe"><b>getOnItemClickListener</b>
+()</A></nobr><br>
+<!-- Method getOnItemSelectedListener -->
+<nobr><A HREF="android.widget.AutoCompleteTextView.html#android.widget.AutoCompleteTextView.getOnItemSelectedListener_added()" class="hiddenlink" target="rightframe"><b>getOnItemSelectedListener</b>
+()</A></nobr><br>
+<!-- Method getOrientation -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.getOrientation_added(float[], float[])" class="hiddenlink" target="rightframe"><b>getOrientation</b>
+(<code>float[], float[]</code>)</A></nobr><br>
+<!-- Method getOriginalUrl -->
+<i>getOriginalUrl</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.webkit.WebHistoryItem.html#android.webkit.WebHistoryItem.getOriginalUrl_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.webkit.WebHistoryItem
+</A></nobr><br>
+<!-- Method getOriginalUrl -->
+&nbsp;&nbsp;<nobr><A HREF="android.webkit.WebView.html#android.webkit.WebView.getOriginalUrl_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.webkit.WebView
+</A></nobr><br>
+<!-- Method getPluginData -->
+<i>getPluginData</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.webkit.UrlInterceptHandler.html#android.webkit.UrlInterceptHandler.getPluginData_added(java.lang.String, java.util.Map<java.lang.String, java.lang.String>)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>String, Map&lt;String, String&gt;</code>)</b>&nbsp;in&nbsp;android.webkit.UrlInterceptHandler
+</A></nobr><br>
+<!-- Method getPluginData -->
+&nbsp;&nbsp;<nobr><A HREF="android.webkit.UrlInterceptRegistry.html#android.webkit.UrlInterceptRegistry.getPluginData_added(java.lang.String, java.util.Map<java.lang.String, java.lang.String>)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>String, Map&lt;String, String&gt;</code>)</b>&nbsp;in&nbsp;android.webkit.UrlInterceptRegistry
+</A></nobr><br>
+<!-- Method getPrivateImeOptions -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.getPrivateImeOptions_added()" class="hiddenlink" target="rightframe"><b>getPrivateImeOptions</b>
+()</A></nobr><br>
+<!-- Method getProxyClass -->
+<nobr><A HREF="java.lang.reflect.Proxy.html#java.lang.reflect.Proxy.getProxyClass_changed(java.lang.ClassLoader, java.lang.Class<?>...)" class="hiddenlink" target="rightframe">getProxyClass
+(<code>ClassLoader, Class&lt;?&gt;</code>)</A></nobr><br>
+<!-- Method getRotationMatrix -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.getRotationMatrix_added(float[], float[], float[], float[])" class="hiddenlink" target="rightframe"><b>getRotationMatrix</b>
+(<code>float[], float[], float[], float[]</code>)</A></nobr><br>
+<!-- Method getRunningAppProcesses -->
+<nobr><A HREF="android.app.ActivityManager.html#android.app.ActivityManager.getRunningAppProcesses_added()" class="hiddenlink" target="rightframe"><b>getRunningAppProcesses</b>
+()</A></nobr><br>
+<!-- Method getScaledDoubleTapSlop -->
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getScaledDoubleTapSlop_added()" class="hiddenlink" target="rightframe"><b>getScaledDoubleTapSlop</b>
+()</A></nobr><br>
+<!-- Method getScaledEdgeSlop -->
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getScaledEdgeSlop_added()" class="hiddenlink" target="rightframe"><b>getScaledEdgeSlop</b>
+()</A></nobr><br>
+<!-- Method getScaledFadingEdgeLength -->
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getScaledFadingEdgeLength_added()" class="hiddenlink" target="rightframe"><b>getScaledFadingEdgeLength</b>
+()</A></nobr><br>
+<!-- Method getScaledMaximumDrawingCacheSize -->
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getScaledMaximumDrawingCacheSize_added()" class="hiddenlink" target="rightframe"><b>getScaledMaximumDrawingCacheSize</b>
+()</A></nobr><br>
+<!-- Method getScaledMinimumFlingVelocity -->
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getScaledMinimumFlingVelocity_added()" class="hiddenlink" target="rightframe"><b>getScaledMinimumFlingVelocity</b>
+()</A></nobr><br>
+<!-- Method getScaledScrollBarSize -->
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getScaledScrollBarSize_added()" class="hiddenlink" target="rightframe"><b>getScaledScrollBarSize</b>
+()</A></nobr><br>
+<!-- Method getScaledTouchSlop -->
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getScaledTouchSlop_added()" class="hiddenlink" target="rightframe"><b>getScaledTouchSlop</b>
+()</A></nobr><br>
+<!-- Method getScaledWindowTouchSlop -->
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getScaledWindowTouchSlop_added()" class="hiddenlink" target="rightframe"><b>getScaledWindowTouchSlop</b>
+()</A></nobr><br>
+<!-- Method getScrollBarSize -->
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getScrollBarSize_changed()" class="hiddenlink" target="rightframe">getScrollBarSize
+()</A></nobr><br>
+<!-- Method getSensorList -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.getSensorList_added(int)" class="hiddenlink" target="rightframe"><b>getSensorList</b>
+(<code>int</code>)</A></nobr><br>
+<!-- Method getSensors -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.getSensors_changed()" class="hiddenlink" target="rightframe">getSensors
+()</A></nobr><br>
+<!-- Method getSize -->
+<nobr><A HREF="android.text.AutoText.html#android.text.AutoText.getSize_added(android.view.View)" class="hiddenlink" target="rightframe"><b>getSize</b>
+(<code>View</code>)</A></nobr><br>
+<!-- Method getSpanTypeId -->
+<i>getSpanTypeId</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.Annotation.html#android.text.Annotation.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.Annotation
+</A></nobr><br>
+<!-- Method getSpanTypeId -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.AbsoluteSizeSpan.html#android.text.style.AbsoluteSizeSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.AbsoluteSizeSpan
+</A></nobr><br>
+<!-- Method getSpanTypeId -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.AlignmentSpan.Standard.html#android.text.style.AlignmentSpan.Standard.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.AlignmentSpan.Standard
+</A></nobr><br>
+<!-- Method getSpanTypeId -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.BackgroundColorSpan.html#android.text.style.BackgroundColorSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.BackgroundColorSpan
+</A></nobr><br>
+<!-- Method getSpanTypeId -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.BulletSpan.html#android.text.style.BulletSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.BulletSpan
+</A></nobr><br>
+<!-- Method getSpanTypeId -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.ForegroundColorSpan.html#android.text.style.ForegroundColorSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.ForegroundColorSpan
+</A></nobr><br>
+<!-- Method getSpanTypeId -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.LeadingMarginSpan.Standard.html#android.text.style.LeadingMarginSpan.Standard.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.LeadingMarginSpan.Standard
+</A></nobr><br>
+<!-- Method getSpanTypeId -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.QuoteSpan.html#android.text.style.QuoteSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.QuoteSpan
+</A></nobr><br>
+<!-- Method getSpanTypeId -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.RelativeSizeSpan.html#android.text.style.RelativeSizeSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.RelativeSizeSpan
+</A></nobr><br>
+<!-- Method getSpanTypeId -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.ScaleXSpan.html#android.text.style.ScaleXSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.ScaleXSpan
+</A></nobr><br>
+<!-- Method getSpanTypeId -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.StrikethroughSpan.html#android.text.style.StrikethroughSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.StrikethroughSpan
+</A></nobr><br>
+<!-- Method getSpanTypeId -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.StyleSpan.html#android.text.style.StyleSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.StyleSpan
+</A></nobr><br>
+<!-- Method getSpanTypeId -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.SubscriptSpan.html#android.text.style.SubscriptSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.SubscriptSpan
+</A></nobr><br>
+<!-- Method getSpanTypeId -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.SuperscriptSpan.html#android.text.style.SuperscriptSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.SuperscriptSpan
+</A></nobr><br>
+<!-- Method getSpanTypeId -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.TextAppearanceSpan.html#android.text.style.TextAppearanceSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.TextAppearanceSpan
+</A></nobr><br>
+<!-- Method getSpanTypeId -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.TypefaceSpan.html#android.text.style.TypefaceSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.TypefaceSpan
+</A></nobr><br>
+<!-- Method getSpanTypeId -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.URLSpan.html#android.text.style.URLSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.URLSpan
+</A></nobr><br>
+<!-- Method getSpanTypeId -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.UnderlineSpan.html#android.text.style.UnderlineSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.UnderlineSpan
+</A></nobr><br>
+<!-- Method getStartX -->
+<nobr><A HREF="android.widget.Scroller.html#android.widget.Scroller.getStartX_added()" class="hiddenlink" target="rightframe"><b>getStartX</b>
+()</A></nobr><br>
+<!-- Method getStartY -->
+<nobr><A HREF="android.widget.Scroller.html#android.widget.Scroller.getStartY_added()" class="hiddenlink" target="rightframe"><b>getStartY</b>
+()</A></nobr><br>
+<!-- Method getStatSize -->
+<nobr><A HREF="android.os.ParcelFileDescriptor.html#android.os.ParcelFileDescriptor.getStatSize_added()" class="hiddenlink" target="rightframe"><b>getStatSize</b>
+()</A></nobr><br>
+<!-- Method getSubtype -->
+<nobr><A HREF="android.net.NetworkInfo.html#android.net.NetworkInfo.getSubtype_added()" class="hiddenlink" target="rightframe"><b>getSubtype</b>
+()</A></nobr><br>
+<!-- Method getSubtypeName -->
+<nobr><A HREF="android.net.NetworkInfo.html#android.net.NetworkInfo.getSubtypeName_added()" class="hiddenlink" target="rightframe"><b>getSubtypeName</b>
+()</A></nobr><br>
+<!-- Method getSurrogate -->
+<nobr><A HREF="android.webkit.UrlInterceptRegistry.html#android.webkit.UrlInterceptRegistry.getSurrogate_changed(java.lang.String, java.util.Map<java.lang.String, java.lang.String>)" class="hiddenlink" target="rightframe">getSurrogate
+(<code>String, Map&lt;String, String&gt;</code>)</A></nobr><br>
+<!-- Method getSystemSharedLibraryNames -->
+<i>getSystemSharedLibraryNames</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.content.pm.PackageManager.html#android.content.pm.PackageManager.getSystemSharedLibraryNames_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.content.pm.PackageManager
+</A></nobr><br>
+<!-- Method getSystemSharedLibraryNames -->
+&nbsp;&nbsp;<nobr><A HREF="android.test.mock.MockPackageManager.html#android.test.mock.MockPackageManager.getSystemSharedLibraryNames_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.test.mock.MockPackageManager
+</A></nobr><br>
+<!-- Method getTargetIntent -->
+<nobr><A HREF="android.app.LauncherActivity.html#android.app.LauncherActivity.getTargetIntent_changed()" class="hiddenlink" target="rightframe">getTargetIntent
+()</A></nobr><br>
+<!-- Method getTextFilter -->
+<nobr><A HREF="android.widget.AbsListView.html#android.widget.AbsListView.getTextFilter_added()" class="hiddenlink" target="rightframe"><b>getTextFilter</b>
+()</A></nobr><br>
+<!-- Method getThread -->
+<nobr><A HREF="android.os.Looper.html#android.os.Looper.getThread_added()" class="hiddenlink" target="rightframe"><b>getThread</b>
+()</A></nobr><br>
+<!-- Method getTimeZoneDatabaseVersion -->
+<nobr><A HREF="android.util.TimeUtils.html#android.util.TimeUtils.getTimeZoneDatabaseVersion_added()" class="hiddenlink" target="rightframe"><b>getTimeZoneDatabaseVersion</b>
+()</A></nobr><br>
+<!-- Method getTouchSlop -->
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getTouchSlop_changed()" class="hiddenlink" target="rightframe">getTouchSlop
+()</A></nobr><br>
+<!-- Method getUserAgent -->
+<nobr><A HREF="android.webkit.WebSettings.html#android.webkit.WebSettings.getUserAgent_changed()" class="hiddenlink" target="rightframe">getUserAgent
+()</A></nobr><br>
+<!-- Method getUserAgentString -->
+<nobr><A HREF="android.webkit.WebSettings.html#android.webkit.WebSettings.getUserAgentString_added()" class="hiddenlink" target="rightframe"><b>getUserAgentString</b>
+()</A></nobr><br>
+<!-- Method getVerticalAlignment -->
+<nobr><A HREF="android.text.style.DynamicDrawableSpan.html#android.text.style.DynamicDrawableSpan.getVerticalAlignment_added()" class="hiddenlink" target="rightframe"><b>getVerticalAlignment</b>
+()</A></nobr><br>
+<!-- Method getWindowTouchSlop -->
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getWindowTouchSlop_changed()" class="hiddenlink" target="rightframe">getWindowTouchSlop
+()</A></nobr><br>
+<!-- Method getWindowVisibleDisplayFrame -->
+<nobr><A HREF="android.view.View.html#android.view.View.getWindowVisibleDisplayFrame_added(android.graphics.Rect)" class="hiddenlink" target="rightframe"><b>getWindowVisibleDisplayFrame</b>
+(<code>Rect</code>)</A></nobr><br>
+<!-- Method getZoomControls -->
+<nobr><A HREF="android.webkit.WebView.html#android.webkit.WebView.getZoomControls_changed()" class="hiddenlink" target="rightframe">getZoomControls
+()</A></nobr><br>
+<!-- Class GLSurfaceView -->
+<A HREF="pkg_android.opengl.html#GLSurfaceView" class="hiddenlink" target="rightframe"><b>GLSurfaceView</b></A><br>
+<!-- Class GLSurfaceView.EGLConfigChooser -->
+<A HREF="pkg_android.opengl.html#GLSurfaceView.EGLConfigChooser" class="hiddenlink" target="rightframe"><b><i>GLSurfaceView.EGLConfigChooser</i></b></A><br>
+<!-- Class GLSurfaceView.GLWrapper -->
+<A HREF="pkg_android.opengl.html#GLSurfaceView.GLWrapper" class="hiddenlink" target="rightframe"><b><i>GLSurfaceView.GLWrapper</i></b></A><br>
+<!-- Class GLSurfaceView.Renderer -->
+<A HREF="pkg_android.opengl.html#GLSurfaceView.Renderer" class="hiddenlink" target="rightframe"><b><i>GLSurfaceView.Renderer</i></b></A><br>
+<!-- Class GpsSatellite -->
+<A HREF="pkg_android.location.html#GpsSatellite" class="hiddenlink" target="rightframe"><b>GpsSatellite</b></A><br>
+<!-- Class GpsStatus -->
+<A HREF="pkg_android.location.html#GpsStatus" class="hiddenlink" target="rightframe"><b>GpsStatus</b></A><br>
+<!-- Class GpsStatus.Listener -->
+<A HREF="pkg_android.location.html#GpsStatus.Listener" class="hiddenlink" target="rightframe"><b><i>GpsStatus.Listener</i></b></A><br>
+<!-- Class Gravity -->
+<A HREF="android.view.Gravity.html" class="hiddenlink" target="rightframe">Gravity</A><br>
+<!-- Class GridView -->
+<A HREF="android.widget.GridView.html" class="hiddenlink" target="rightframe">GridView</A><br>
+<!-- Field handle -->
+<A NAME="H"></A>
+<br><font size="+2">H</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.R.attr.html#android.R.attr.handle" class="hiddenlink" target="rightframe">handle</A>
+</nobr><br>
+<!-- Method handleKeyDown -->
+<nobr><A HREF="android.text.method.MetaKeyKeyListener.html#android.text.method.MetaKeyKeyListener.handleKeyDown_added(long, int, android.view.KeyEvent)" class="hiddenlink" target="rightframe"><b>handleKeyDown</b>
+(<code>long, int, KeyEvent</code>)</A></nobr><br>
+<!-- Method handleKeyUp -->
+<nobr><A HREF="android.text.method.MetaKeyKeyListener.html#android.text.method.MetaKeyKeyListener.handleKeyUp_added(long, int, android.view.KeyEvent)" class="hiddenlink" target="rightframe"><b>handleKeyUp</b>
+(<code>long, int, KeyEvent</code>)</A></nobr><br>
+<!-- Class Handler -->
+<i>Handler</i><br>
+&nbsp;&nbsp;<A HREF="android.os.Handler.html" class="hiddenlink" target="rightframe">android.os</A><br>
+<!-- Constructor Handler -->
+&nbsp;&nbsp;<nobr><A HREF="android.os.Handler.html#android.os.Handler.ctor_added(android.os.Handler.Callback)" class="hiddenlink" target="rightframe"><b>Handler</b>
+(<code>Callback</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Constructor Handler -->
+&nbsp;&nbsp;<nobr><A HREF="android.os.Handler.html#android.os.Handler.ctor_added(android.os.Looper, android.os.Handler.Callback)" class="hiddenlink" target="rightframe"><b>Handler</b>
+(<code>Looper, Callback</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Class Handler.Callback -->
+<A HREF="pkg_android.os.html#Handler.Callback" class="hiddenlink" target="rightframe"><b><i>Handler.Callback</i></b></A><br>
+<!-- Field HAPTIC_FEEDBACK_ENABLED -->
+<i>HAPTIC_FEEDBACK_ENABLED</i><br>
+&nbsp;in&nbsp;
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.HAPTIC_FEEDBACK_ENABLED" class="hiddenlink" target="rightframe">android.provider.Settings.System</A>
+</nobr><br>
+<!-- Field HAPTIC_FEEDBACK_ENABLED -->
+&nbsp;in&nbsp;
+<nobr><A HREF="android.view.View.html#android.view.View.HAPTIC_FEEDBACK_ENABLED" class="hiddenlink" target="rightframe">android.view.View</A>
+</nobr><br>
+<!-- Class HapticFeedbackConstants -->
+<A HREF="pkg_android.view.html#HapticFeedbackConstants" class="hiddenlink" target="rightframe"><b>HapticFeedbackConstants</b></A><br>
+<!-- Field hapticFeedbackEnabled -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.hapticFeedbackEnabled" class="hiddenlink" target="rightframe">hapticFeedbackEnabled</A>
+</nobr><br>
+<!-- Field hardKeyboardHidden -->
+<nobr><A HREF="android.content.res.Configuration.html#android.content.res.Configuration.hardKeyboardHidden" class="hiddenlink" target="rightframe">hardKeyboardHidden</A>
+</nobr><br>
+<!-- Field HARDKEYBOARDHIDDEN_NO -->
+<nobr><A HREF="android.content.res.Configuration.html#android.content.res.Configuration.HARDKEYBOARDHIDDEN_NO" class="hiddenlink" target="rightframe">HARDKEYBOARDHIDDEN_NO</A>
+</nobr><br>
+<!-- Field HARDKEYBOARDHIDDEN_UNDEFINED -->
+<nobr><A HREF="android.content.res.Configuration.html#android.content.res.Configuration.HARDKEYBOARDHIDDEN_UNDEFINED" class="hiddenlink" target="rightframe">HARDKEYBOARDHIDDEN_UNDEFINED</A>
+</nobr><br>
+<!-- Field HARDKEYBOARDHIDDEN_YES -->
+<nobr><A HREF="android.content.res.Configuration.html#android.content.res.Configuration.HARDKEYBOARDHIDDEN_YES" class="hiddenlink" target="rightframe">HARDKEYBOARDHIDDEN_YES</A>
+</nobr><br>
+<!-- Method hasSoftInputMode -->
+<nobr><A HREF="android.view.Window.html#android.view.Window.hasSoftInputMode_added()" class="hiddenlink" target="rightframe"><b>hasSoftInputMode</b>
+()</A></nobr><br>
+<!-- Method hasWindowFocus -->
+<nobr><A HREF="android.app.Activity.html#android.app.Activity.hasWindowFocus_added()" class="hiddenlink" target="rightframe"><b>hasWindowFocus</b>
+()</A></nobr><br>
+<!-- Field headerDividersEnabled -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.headerDividersEnabled" class="hiddenlink" target="rightframe">headerDividersEnabled</A>
+</nobr><br>
+<!-- Field horizontalGap -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.horizontalGap" class="hiddenlink" target="rightframe">horizontalGap</A>
+</nobr><br>
+<!-- Class HorizontalScrollView -->
+<A HREF="pkg_android.widget.html#HorizontalScrollView" class="hiddenlink" target="rightframe"><b>HorizontalScrollView</b></A><br>
+<!-- Field HTTP_PROXY -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.HTTP_PROXY" class="hiddenlink" target="rightframe">HTTP_PROXY</A>
+</nobr><br>
+<!-- Class IBinder -->
+<A NAME="I"></A>
+<br><font size="+2">I</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.os.IBinder.html" class="hiddenlink" target="rightframe"><i>IBinder</i></A><br>
+<!-- Field ic_btn_speak_now -->
+<nobr><A HREF="android.R.drawable.html#android.R.drawable.ic_btn_speak_now" class="hiddenlink" target="rightframe">ic_btn_speak_now</A>
+</nobr><br>
+<!-- Field iconPreview -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.iconPreview" class="hiddenlink" target="rightframe">iconPreview</A>
+</nobr><br>
+<!-- Class ImageSpan -->
+<i>ImageSpan</i><br>
+&nbsp;&nbsp;<A HREF="android.text.style.ImageSpan.html" class="hiddenlink" target="rightframe">android.text.style</A><br>
+<!-- Constructor ImageSpan -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.ImageSpan.html#android.text.style.ImageSpan.ctor_added(android.content.Context, android.net.Uri, int)" class="hiddenlink" target="rightframe"><b>ImageSpan</b>
+(<code>Context, Uri, int</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Constructor ImageSpan -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.ImageSpan.html#android.text.style.ImageSpan.ctor_added(android.content.Context, int, int)" class="hiddenlink" target="rightframe"><b>ImageSpan</b>
+(<code>Context, int, int</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Constructor ImageSpan -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.ImageSpan.html#android.text.style.ImageSpan.ctor_added(android.graphics.Bitmap, int)" class="hiddenlink" target="rightframe"><b>ImageSpan</b>
+(<code>Bitmap, int</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Constructor ImageSpan -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.ImageSpan.html#android.text.style.ImageSpan.ctor_added(android.graphics.drawable.Drawable, int)" class="hiddenlink" target="rightframe"><b>ImageSpan</b>
+(<code>Drawable, int</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Constructor ImageSpan -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.ImageSpan.html#android.text.style.ImageSpan.ctor_added(android.graphics.drawable.Drawable, java.lang.String, int)" class="hiddenlink" target="rightframe"><b>ImageSpan</b>
+(<code>Drawable, String, int</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Field imeActionId -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.imeActionId" class="hiddenlink" target="rightframe">imeActionId</A>
+</nobr><br>
+<!-- Field imeActionLabel -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.imeActionLabel" class="hiddenlink" target="rightframe">imeActionLabel</A>
+</nobr><br>
+<!-- Field imeExtractEnterAnimation -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.imeExtractEnterAnimation" class="hiddenlink" target="rightframe">imeExtractEnterAnimation</A>
+</nobr><br>
+<!-- Field imeExtractExitAnimation -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.imeExtractExitAnimation" class="hiddenlink" target="rightframe">imeExtractExitAnimation</A>
+</nobr><br>
+<!-- Field imeFullscreenBackground -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.imeFullscreenBackground" class="hiddenlink" target="rightframe">imeFullscreenBackground</A>
+</nobr><br>
+<!-- Field imeOptions -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.imeOptions" class="hiddenlink" target="rightframe">imeOptions</A>
+</nobr><br>
+<!-- Method inferStreamType -->
+<nobr><A HREF="android.media.RingtoneManager.html#android.media.RingtoneManager.inferStreamType_added()" class="hiddenlink" target="rightframe"><b>inferStreamType</b>
+()</A></nobr><br>
+<!-- Field initialLayout -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.initialLayout" class="hiddenlink" target="rightframe">initialLayout</A>
+</nobr><br>
+<!-- Field innerRadius -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.innerRadius" class="hiddenlink" target="rightframe">innerRadius</A>
+</nobr><br>
+<!-- Field INPUT_METHOD_FROM_FOCUSABLE -->
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.INPUT_METHOD_FROM_FOCUSABLE" class="hiddenlink" target="rightframe">INPUT_METHOD_FROM_FOCUSABLE</A>
+</nobr><br>
+<!-- Field INPUT_METHOD_NEEDED -->
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.INPUT_METHOD_NEEDED" class="hiddenlink" target="rightframe">INPUT_METHOD_NEEDED</A>
+</nobr><br>
+<!-- Field INPUT_METHOD_NOT_NEEDED -->
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.INPUT_METHOD_NOT_NEEDED" class="hiddenlink" target="rightframe">INPUT_METHOD_NOT_NEEDED</A>
+</nobr><br>
+<!-- Field INPUT_METHOD_SERVICE -->
+<nobr><A HREF="android.content.Context.html#android.content.Context.INPUT_METHOD_SERVICE" class="hiddenlink" target="rightframe">INPUT_METHOD_SERVICE</A>
+</nobr><br>
+<!-- Field inputArea -->
+<nobr><A HREF="android.R.id.html#android.R.id.inputArea" class="hiddenlink" target="rightframe">inputArea</A>
+</nobr><br>
+<!-- Field inputExtractEditText -->
+<nobr><A HREF="android.R.id.html#android.R.id.inputExtractEditText" class="hiddenlink" target="rightframe">inputExtractEditText</A>
+</nobr><br>
+<!-- Field inputMethod -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.inputMethod" class="hiddenlink" target="rightframe">inputMethod</A>
+</nobr><br>
+<!-- Class InputType -->
+<A HREF="pkg_android.text.html#InputType" class="hiddenlink" target="rightframe"><b><i>InputType</i></b></A><br>
+<!-- Field inputType -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.inputType" class="hiddenlink" target="rightframe">inputType</A>
+</nobr><br>
+<!-- Field INSTALL_FAILED_CONFLICTING_PROVIDER -->
+<nobr><A HREF="android.content.pm.PackageManager.html#android.content.pm.PackageManager.INSTALL_FAILED_CONFLICTING_PROVIDER" class="hiddenlink" target="rightframe">INSTALL_FAILED_CONFLICTING_PROVIDER</A>
+</nobr><br>
+<!-- Field INSTALL_NON_MARKET_APPS -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.INSTALL_NON_MARKET_APPS" class="hiddenlink" target="rightframe">INSTALL_NON_MARKET_APPS</A>
+</nobr><br>
+<!-- Class Instrumentation -->
+<A HREF="android.app.Instrumentation.html" class="hiddenlink" target="rightframe">Instrumentation</A><br>
+<!-- Class InstrumentationTestCase -->
+<A HREF="android.test.InstrumentationTestCase.html" class="hiddenlink" target="rightframe">InstrumentationTestCase</A><br>
+<!-- Class Intent -->
+<A HREF="android.content.Intent.html" class="hiddenlink" target="rightframe">Intent</A><br>
+<!-- Field INTENT_ACTION_MEDIA_SEARCH -->
+<nobr><A HREF="android.provider.MediaStore.html#android.provider.MediaStore.INTENT_ACTION_MEDIA_SEARCH" class="hiddenlink" target="rightframe">INTENT_ACTION_MEDIA_SEARCH</A>
+</nobr><br>
+<!-- Field INTENT_ACTION_STILL_IMAGE_CAMERA -->
+<nobr><A HREF="android.provider.MediaStore.html#android.provider.MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA" class="hiddenlink" target="rightframe">INTENT_ACTION_STILL_IMAGE_CAMERA</A>
+</nobr><br>
+<!-- Field INTENT_ACTION_VIDEO_CAMERA -->
+<nobr><A HREF="android.provider.MediaStore.html#android.provider.MediaStore.INTENT_ACTION_VIDEO_CAMERA" class="hiddenlink" target="rightframe">INTENT_ACTION_VIDEO_CAMERA</A>
+</nobr><br>
+<!-- Method intentForPosition -->
+<nobr><A HREF="android.app.LauncherActivity.html#android.app.LauncherActivity.intentForPosition_added(int)" class="hiddenlink" target="rightframe"><b>intentForPosition</b>
+(<code>int</code>)</A></nobr><br>
+<!-- Class IntentService -->
+<A HREF="pkg_android.app.html#IntentService" class="hiddenlink" target="rightframe"><b>IntentService</b></A><br>
+<!-- Field INTERVAL_DAY -->
+<nobr><A HREF="android.app.AlarmManager.html#android.app.AlarmManager.INTERVAL_DAY" class="hiddenlink" target="rightframe">INTERVAL_DAY</A>
+</nobr><br>
+<!-- Field INTERVAL_FIFTEEN_MINUTES -->
+<nobr><A HREF="android.app.AlarmManager.html#android.app.AlarmManager.INTERVAL_FIFTEEN_MINUTES" class="hiddenlink" target="rightframe">INTERVAL_FIFTEEN_MINUTES</A>
+</nobr><br>
+<!-- Field INTERVAL_HALF_DAY -->
+<nobr><A HREF="android.app.AlarmManager.html#android.app.AlarmManager.INTERVAL_HALF_DAY" class="hiddenlink" target="rightframe">INTERVAL_HALF_DAY</A>
+</nobr><br>
+<!-- Field INTERVAL_HALF_HOUR -->
+<nobr><A HREF="android.app.AlarmManager.html#android.app.AlarmManager.INTERVAL_HALF_HOUR" class="hiddenlink" target="rightframe">INTERVAL_HALF_HOUR</A>
+</nobr><br>
+<!-- Field INTERVAL_HOUR -->
+<nobr><A HREF="android.app.AlarmManager.html#android.app.AlarmManager.INTERVAL_HOUR" class="hiddenlink" target="rightframe">INTERVAL_HOUR</A>
+</nobr><br>
+<!-- Method isAboveAnchor -->
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.isAboveAnchor_added()" class="hiddenlink" target="rightframe"><b>isAboveAnchor</b>
+()</A></nobr><br>
+<!-- Method isBluetoothA2dpOn -->
+<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.isBluetoothA2dpOn_added()" class="hiddenlink" target="rightframe"><b>isBluetoothA2dpOn</b>
+()</A></nobr><br>
+<!-- Method isClippingEnabled -->
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.isClippingEnabled_added()" class="hiddenlink" target="rightframe"><b>isClippingEnabled</b>
+()</A></nobr><br>
+<!-- Method isCookielessProxyUrl -->
+<nobr><A HREF="android.webkit.URLUtil.html#android.webkit.URLUtil.isCookielessProxyUrl_changed(java.lang.String)" class="hiddenlink" target="rightframe">isCookielessProxyUrl
+(<code>String</code>)</A></nobr><br>
+<!-- Method isDebuggingEnabled -->
+<nobr><A HREF="dalvik.system.VMDebug.html#dalvik.system.VMDebug.isDebuggingEnabled_added()" class="hiddenlink" target="rightframe"><b>isDebuggingEnabled</b>
+()</A></nobr><br>
+<!-- Field isDefault -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.isDefault" class="hiddenlink" target="rightframe">isDefault</A>
+</nobr><br>
+<!-- Method isFastScrollEnabled -->
+<nobr><A HREF="android.widget.AbsListView.html#android.widget.AbsListView.isFastScrollEnabled_added()" class="hiddenlink" target="rightframe"><b>isFastScrollEnabled</b>
+()</A></nobr><br>
+<!-- Method isFillEnabled -->
+<nobr><A HREF="android.view.animation.Animation.html#android.view.animation.Animation.isFillEnabled_added()" class="hiddenlink" target="rightframe"><b>isFillEnabled</b>
+()</A></nobr><br>
+<!-- Method isHapticFeedbackEnabled -->
+<nobr><A HREF="android.view.View.html#android.view.View.isHapticFeedbackEnabled_added()" class="hiddenlink" target="rightframe"><b>isHapticFeedbackEnabled</b>
+()</A></nobr><br>
+<!-- Method isInEditMode -->
+<nobr><A HREF="android.view.View.html#android.view.View.isInEditMode_added()" class="hiddenlink" target="rightframe"><b>isInEditMode</b>
+()</A></nobr><br>
+<!-- Method isInputMethodTarget -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.isInputMethodTarget_added()" class="hiddenlink" target="rightframe"><b>isInputMethodTarget</b>
+()</A></nobr><br>
+<!-- Method isLooping -->
+<nobr><A HREF="android.media.MediaPlayer.html#android.media.MediaPlayer.isLooping_added()" class="hiddenlink" target="rightframe"><b>isLooping</b>
+()</A></nobr><br>
+<!-- Field isModifier -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.isModifier" class="hiddenlink" target="rightframe">isModifier</A>
+</nobr><br>
+<!-- Method isOutsideTouchable -->
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.isOutsideTouchable_added()" class="hiddenlink" target="rightframe"><b>isOutsideTouchable</b>
+()</A></nobr><br>
+<!-- Method isPerformingCompletion -->
+<nobr><A HREF="android.widget.AutoCompleteTextView.html#android.widget.AutoCompleteTextView.isPerformingCompletion_added()" class="hiddenlink" target="rightframe"><b>isPerformingCompletion</b>
+()</A></nobr><br>
+<!-- Field isRepeatable -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.isRepeatable" class="hiddenlink" target="rightframe">isRepeatable</A>
+</nobr><br>
+<!-- Method isRoaming -->
+<nobr><A HREF="android.net.NetworkInfo.html#android.net.NetworkInfo.isRoaming_added()" class="hiddenlink" target="rightframe"><b>isRoaming</b>
+()</A></nobr><br>
+<!-- Method isSafeMode -->
+<i>isSafeMode</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.content.pm.PackageManager.html#android.content.pm.PackageManager.isSafeMode_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.content.pm.PackageManager
+</A></nobr><br>
+<!-- Method isSafeMode -->
+&nbsp;&nbsp;<nobr><A HREF="android.test.mock.MockPackageManager.html#android.test.mock.MockPackageManager.isSafeMode_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.test.mock.MockPackageManager
+</A></nobr><br>
+<!-- Field isScrollContainer -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.isScrollContainer" class="hiddenlink" target="rightframe">isScrollContainer</A>
+</nobr><br>
+<!-- Method isSelectingMetaTracker -->
+<nobr><A HREF="android.text.method.MetaKeyKeyListener.html#android.text.method.MetaKeyKeyListener.isSelectingMetaTracker_added(java.lang.CharSequence, java.lang.Object)" class="hiddenlink" target="rightframe"><b>isSelectingMetaTracker</b>
+(<code>CharSequence, Object</code>)</A></nobr><br>
+<!-- Method isSmoothScrollbarEnabled -->
+<nobr><A HREF="android.widget.AbsListView.html#android.widget.AbsListView.isSmoothScrollbarEnabled_added()" class="hiddenlink" target="rightframe"><b>isSmoothScrollbarEnabled</b>
+()</A></nobr><br>
+<!-- Field isSticky -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.isSticky" class="hiddenlink" target="rightframe">isSticky</A>
+</nobr><br>
+<!-- Method isTouchable -->
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.isTouchable_added()" class="hiddenlink" target="rightframe"><b>isTouchable</b>
+()</A></nobr><br>
+<!-- Package java.beans -->
+<A NAME="J"></A>
+<A HREF="changes-summary.html#java.beans" class="hiddenlink" target="rightframe"><b>java.beans</b></A><br>
+<!-- Package java.lang -->
+<A HREF="pkg_java.lang.html" class="hiddenlink" target="rightframe">java.lang</A><br>
+<!-- Package java.lang.reflect -->
+<A HREF="pkg_java.lang.reflect.html" class="hiddenlink" target="rightframe">java.lang.reflect</A><br>
+<!-- Package java.net -->
+<A HREF="pkg_java.net.html" class="hiddenlink" target="rightframe">java.net</A><br>
+<!-- Package java.util -->
+<A HREF="pkg_java.util.html" class="hiddenlink" target="rightframe">java.util</A><br>
+<!-- Package java.util.jar -->
+<A HREF="pkg_java.util.jar.html" class="hiddenlink" target="rightframe">java.util.jar</A><br>
+<!-- Package java.util.logging -->
+<A HREF="pkg_java.util.logging.html" class="hiddenlink" target="rightframe">java.util.logging</A><br>
+<!-- Class JetPlayer -->
+<A HREF="pkg_android.media.html#JetPlayer" class="hiddenlink" target="rightframe"><b>JetPlayer</b></A><br>
+<!-- Class JetPlayer.OnJetEventListener -->
+<A HREF="pkg_android.media.html#JetPlayer.OnJetEventListener" class="hiddenlink" target="rightframe"><b><i>JetPlayer.OnJetEventListener</i></b></A><br>
+<!-- Field KEY_LOCATION_CHANGED -->
+<A NAME="K"></A>
+<br><font size="+2">K</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.KEY_LOCATION_CHANGED" class="hiddenlink" target="rightframe">KEY_LOCATION_CHANGED</A>
+</nobr><br>
+<!-- Field KEY_PROVIDER_ENABLED -->
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.KEY_PROVIDER_ENABLED" class="hiddenlink" target="rightframe">KEY_PROVIDER_ENABLED</A>
+</nobr><br>
+<!-- Field KEY_STATUS_CHANGED -->
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.KEY_STATUS_CHANGED" class="hiddenlink" target="rightframe">KEY_STATUS_CHANGED</A>
+</nobr><br>
+<!-- Field keyBackground -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.keyBackground" class="hiddenlink" target="rightframe">keyBackground</A>
+</nobr><br>
+<!-- Field keyboardMode -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.keyboardMode" class="hiddenlink" target="rightframe">keyboardMode</A>
+</nobr><br>
+<!-- Field keyboardView -->
+<nobr><A HREF="android.R.id.html#android.R.id.keyboardView" class="hiddenlink" target="rightframe">keyboardView</A>
+</nobr><br>
+<!-- Class KeyCharacterMap -->
+<A HREF="android.view.KeyCharacterMap.html" class="hiddenlink" target="rightframe">KeyCharacterMap</A><br>
+<!-- Field KEYCODE_MEDIA_FAST_FORWARD -->
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.KEYCODE_MEDIA_FAST_FORWARD" class="hiddenlink" target="rightframe">KEYCODE_MEDIA_FAST_FORWARD</A>
+</nobr><br>
+<!-- Field KEYCODE_MEDIA_NEXT -->
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.KEYCODE_MEDIA_NEXT" class="hiddenlink" target="rightframe">KEYCODE_MEDIA_NEXT</A>
+</nobr><br>
+<!-- Field KEYCODE_MEDIA_PLAY_PAUSE -->
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE" class="hiddenlink" target="rightframe">KEYCODE_MEDIA_PLAY_PAUSE</A>
+</nobr><br>
+<!-- Field KEYCODE_MEDIA_PREVIOUS -->
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.KEYCODE_MEDIA_PREVIOUS" class="hiddenlink" target="rightframe">KEYCODE_MEDIA_PREVIOUS</A>
+</nobr><br>
+<!-- Field KEYCODE_MEDIA_REWIND -->
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.KEYCODE_MEDIA_REWIND" class="hiddenlink" target="rightframe">KEYCODE_MEDIA_REWIND</A>
+</nobr><br>
+<!-- Field KEYCODE_MEDIA_STOP -->
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.KEYCODE_MEDIA_STOP" class="hiddenlink" target="rightframe">KEYCODE_MEDIA_STOP</A>
+</nobr><br>
+<!-- Field KEYCODE_MUTE -->
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.KEYCODE_MUTE" class="hiddenlink" target="rightframe">KEYCODE_MUTE</A>
+</nobr><br>
+<!-- Field keyEdgeFlags -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.keyEdgeFlags" class="hiddenlink" target="rightframe">keyEdgeFlags</A>
+</nobr><br>
+<!-- Class KeyEvent -->
+<i>KeyEvent</i><br>
+&nbsp;&nbsp;<A HREF="android.view.KeyEvent.html" class="hiddenlink" target="rightframe">android.view</A><br>
+<!-- Constructor KeyEvent -->
+&nbsp;&nbsp;<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.ctor_added(android.view.KeyEvent)" class="hiddenlink" target="rightframe"><b>KeyEvent</b>
+(<code>KeyEvent</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Constructor KeyEvent -->
+&nbsp;&nbsp;<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.ctor_added(long, java.lang.String, int, int)" class="hiddenlink" target="rightframe"><b>KeyEvent</b>
+(<code>long, String, int, int</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Field keyHeight -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.keyHeight" class="hiddenlink" target="rightframe">keyHeight</A>
+</nobr><br>
+<!-- Field keyIcon -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.keyIcon" class="hiddenlink" target="rightframe">keyIcon</A>
+</nobr><br>
+<!-- Field keyLabel -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.keyLabel" class="hiddenlink" target="rightframe">keyLabel</A>
+</nobr><br>
+<!-- Class KeyListener -->
+<A HREF="android.text.method.KeyListener.html" class="hiddenlink" target="rightframe"><i>KeyListener</i></A><br>
+<!-- Field keyOutputText -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.keyOutputText" class="hiddenlink" target="rightframe">keyOutputText</A>
+</nobr><br>
+<!-- Field keyPreviewHeight -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.keyPreviewHeight" class="hiddenlink" target="rightframe">keyPreviewHeight</A>
+</nobr><br>
+<!-- Field keyPreviewLayout -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.keyPreviewLayout" class="hiddenlink" target="rightframe">keyPreviewLayout</A>
+</nobr><br>
+<!-- Field keyPreviewOffset -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.keyPreviewOffset" class="hiddenlink" target="rightframe">keyPreviewOffset</A>
+</nobr><br>
+<!-- Field keyTextColor -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.keyTextColor" class="hiddenlink" target="rightframe">keyTextColor</A>
+</nobr><br>
+<!-- Field keyTextSize -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.keyTextSize" class="hiddenlink" target="rightframe">keyTextSize</A>
+</nobr><br>
+<!-- Field keyWidth -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.keyWidth" class="hiddenlink" target="rightframe">keyWidth</A>
+</nobr><br>
+<!-- Field labelTextSize -->
+<A NAME="L"></A>
+<br><font size="+2">L</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.R.attr.html#android.R.attr.labelTextSize" class="hiddenlink" target="rightframe">labelTextSize</A>
+</nobr><br>
+<!-- Method launchActivityWithIntent -->
+<nobr><A HREF="android.test.InstrumentationTestCase.html#android.test.InstrumentationTestCase.launchActivityWithIntent_added(java.lang.String, java.lang.Class<T>, android.content.Intent)" class="hiddenlink" target="rightframe"><b>launchActivityWithIntent</b>
+(<code>String, Class&lt;T&gt;, Intent</code>)</A></nobr><br>
+<!-- Class LauncherActivity -->
+<A HREF="android.app.LauncherActivity.html" class="hiddenlink" target="rightframe">LauncherActivity</A><br>
+<!-- Class LauncherActivity.IconResizer -->
+<A HREF="pkg_android.app.html#LauncherActivity.IconResizer" class="hiddenlink" target="rightframe"><b>LauncherActivity.IconResizer</b></A><br>
+<!-- Class LauncherActivity.ListItem -->
+<A HREF="pkg_android.app.html#LauncherActivity.ListItem" class="hiddenlink" target="rightframe"><b>LauncherActivity.ListItem</b></A><br>
+<!-- Class LeadingMarginSpan.Standard -->
+<i>LeadingMarginSpan.Standard</i><br>
+&nbsp;&nbsp;<A HREF="android.text.style.LeadingMarginSpan.Standard.html" class="hiddenlink" target="rightframe">android.text.style</A><br>
+<!-- Constructor LeadingMarginSpan.Standard -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.LeadingMarginSpan.Standard.html#android.text.style.LeadingMarginSpan.Standard.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>LeadingMarginSpan.Standard</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Class Level -->
+<A HREF="java.util.logging.Level.html" class="hiddenlink" target="rightframe">Level</A><br>
+<!-- Field LIGHT_NO_MOON -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.LIGHT_NO_MOON" class="hiddenlink" target="rightframe">LIGHT_NO_MOON</A>
+</nobr><br>
+<!-- Class ListView -->
+<A HREF="android.widget.ListView.html" class="hiddenlink" target="rightframe">ListView</A><br>
+<!-- Class LiveFolders -->
+<A HREF="pkg_android.provider.html#LiveFolders" class="hiddenlink" target="rightframe"><b>LiveFolders</b></A><br>
+<!-- Method load -->
+<i>load</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.media.SoundPool.html#android.media.SoundPool.load_added(android.content.res.AssetFileDescriptor, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>AssetFileDescriptor, int</code>)</b>&nbsp;in&nbsp;android.media.SoundPool
+</A></nobr><br>
+<!-- Method load -->
+&nbsp;&nbsp;<nobr><A HREF="android.media.SoundPool.html#android.media.SoundPool.load_added(java.io.FileDescriptor, long, long, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>FileDescriptor, long, long, int</code>)</b>&nbsp;in&nbsp;android.media.SoundPool
+</A></nobr><br>
+<!-- Method loadDex -->
+<nobr><A HREF="dalvik.system.DexFile.html#dalvik.system.DexFile.loadDex_added(java.lang.String, java.lang.String, int)" class="hiddenlink" target="rightframe"><b>loadDex</b>
+(<code>String, String, int</code>)</A></nobr><br>
+<!-- Class Location -->
+<A HREF="android.location.Location.html" class="hiddenlink" target="rightframe">Location</A><br>
+<!-- Field LOCATION_PROVIDERS_ALLOWED -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.LOCATION_PROVIDERS_ALLOWED" class="hiddenlink" target="rightframe">LOCATION_PROVIDERS_ALLOWED</A>
+</nobr><br>
+<!-- Class LocationManager -->
+<A HREF="android.location.LocationManager.html" class="hiddenlink" target="rightframe">LocationManager</A><br>
+<!-- Field LOCK_PATTERN_TACTILE_FEEDBACK_ENABLED -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.LOCK_PATTERN_TACTILE_FEEDBACK_ENABLED" class="hiddenlink" target="rightframe">LOCK_PATTERN_TACTILE_FEEDBACK_ENABLED</A>
+</nobr><br>
+<!-- Field LOGGING_ID -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.LOGGING_ID" class="hiddenlink" target="rightframe">LOGGING_ID</A>
+</nobr><br>
+<!-- Class LogManager -->
+<A HREF="java.util.logging.LogManager.html" class="hiddenlink" target="rightframe">LogManager</A><br>
+<!-- Method longClickView -->
+<i>longClickView</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.longClickView_added(android.test.InstrumentationTestCase, android.view.View)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>InstrumentationTestCase, View</code>)</b>&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+<!-- Method longClickView -->
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.longClickView_changed(android.test.ActivityInstrumentationTestCase, android.view.View)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>ActivityInstrumentationTestCase, View</code>)&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+<!-- Class Looper -->
+<A HREF="android.os.Looper.html" class="hiddenlink" target="rightframe">Looper</A><br>
+<!-- Method makeListItems -->
+<A NAME="M"></A>
+<br><font size="+2">M</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.app.LauncherActivity.html#android.app.LauncherActivity.makeListItems_added()" class="hiddenlink" target="rightframe"><b>makeListItems</b>
+()</A></nobr><br>
+<!-- Class Manifest.permission -->
+<A HREF="android.Manifest.permission.html" class="hiddenlink" target="rightframe">Manifest.permission</A><br>
+<!-- Class MaskFilterSpan -->
+<A HREF="android.text.style.MaskFilterSpan.html" class="hiddenlink" target="rightframe">MaskFilterSpan</A><br>
+<!-- Field MAX_KEYCODE -->
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.MAX_KEYCODE" class="hiddenlink" target="rightframe">MAX_KEYCODE</A>
+</nobr><br>
+<!-- Method mayUseInputMethod -->
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.mayUseInputMethod_added(int)" class="hiddenlink" target="rightframe"><b>mayUseInputMethod</b>
+(<code>int</code>)</A></nobr><br>
+<!-- Field MEDIA_CHECKING -->
+<nobr><A HREF="android.os.Environment.html#android.os.Environment.MEDIA_CHECKING" class="hiddenlink" target="rightframe">MEDIA_CHECKING</A>
+</nobr><br>
+<!-- Field MEDIA_ERROR_NOT_VALID_FOR_PROGRESSIVE_PLAYBACK -->
+<nobr><A HREF="android.media.MediaPlayer.html#android.media.MediaPlayer.MEDIA_ERROR_NOT_VALID_FOR_PROGRESSIVE_PLAYBACK" class="hiddenlink" target="rightframe">MEDIA_ERROR_NOT_VALID_FOR_PROGRESSIVE_PLAYBACK</A>
+</nobr><br>
+<!-- Field MEDIA_INFO_BAD_INTERLEAVING -->
+<nobr><A HREF="android.media.MediaPlayer.html#android.media.MediaPlayer.MEDIA_INFO_BAD_INTERLEAVING" class="hiddenlink" target="rightframe">MEDIA_INFO_BAD_INTERLEAVING</A>
+</nobr><br>
+<!-- Field MEDIA_INFO_NOT_SEEKABLE -->
+<nobr><A HREF="android.media.MediaPlayer.html#android.media.MediaPlayer.MEDIA_INFO_NOT_SEEKABLE" class="hiddenlink" target="rightframe">MEDIA_INFO_NOT_SEEKABLE</A>
+</nobr><br>
+<!-- Field MEDIA_INFO_UNKNOWN -->
+<nobr><A HREF="android.media.MediaPlayer.html#android.media.MediaPlayer.MEDIA_INFO_UNKNOWN" class="hiddenlink" target="rightframe">MEDIA_INFO_UNKNOWN</A>
+</nobr><br>
+<!-- Field MEDIA_INFO_VIDEO_TRACK_LAGGING -->
+<nobr><A HREF="android.media.MediaPlayer.html#android.media.MediaPlayer.MEDIA_INFO_VIDEO_TRACK_LAGGING" class="hiddenlink" target="rightframe">MEDIA_INFO_VIDEO_TRACK_LAGGING</A>
+</nobr><br>
+<!-- Field MEDIA_NOFS -->
+<nobr><A HREF="android.os.Environment.html#android.os.Environment.MEDIA_NOFS" class="hiddenlink" target="rightframe">MEDIA_NOFS</A>
+</nobr><br>
+<!-- Field MEDIA_RECORDER_ERROR_UNKNOWN -->
+<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.MEDIA_RECORDER_ERROR_UNKNOWN" class="hiddenlink" target="rightframe">MEDIA_RECORDER_ERROR_UNKNOWN</A>
+</nobr><br>
+<!-- Field MEDIA_RECORDER_INFO_MAX_DURATION_REACHED -->
+<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.MEDIA_RECORDER_INFO_MAX_DURATION_REACHED" class="hiddenlink" target="rightframe">MEDIA_RECORDER_INFO_MAX_DURATION_REACHED</A>
+</nobr><br>
+<!-- Field MEDIA_RECORDER_INFO_MAX_FILESIZE_REACHED -->
+<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.MEDIA_RECORDER_INFO_MAX_FILESIZE_REACHED" class="hiddenlink" target="rightframe">MEDIA_RECORDER_INFO_MAX_FILESIZE_REACHED</A>
+</nobr><br>
+<!-- Field MEDIA_RECORDER_INFO_UNKNOWN -->
+<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.MEDIA_RECORDER_INFO_UNKNOWN" class="hiddenlink" target="rightframe">MEDIA_RECORDER_INFO_UNKNOWN</A>
+</nobr><br>
+<!-- Class MediaPlayer -->
+<A HREF="android.media.MediaPlayer.html" class="hiddenlink" target="rightframe">MediaPlayer</A><br>
+<!-- Class MediaPlayer.OnInfoListener -->
+<A HREF="pkg_android.media.html#MediaPlayer.OnInfoListener" class="hiddenlink" target="rightframe"><b><i>MediaPlayer.OnInfoListener</i></b></A><br>
+<!-- Class MediaPlayer.OnVideoSizeChangedListener -->
+<A HREF="pkg_android.media.html#MediaPlayer.OnVideoSizeChangedListener" class="hiddenlink" target="rightframe"><b><i>MediaPlayer.OnVideoSizeChangedListener</i></b></A><br>
+<!-- Class MediaRecorder -->
+<A HREF="android.media.MediaRecorder.html" class="hiddenlink" target="rightframe">MediaRecorder</A><br>
+<!-- Class MediaRecorder.OnErrorListener -->
+<A HREF="pkg_android.media.html#MediaRecorder.OnErrorListener" class="hiddenlink" target="rightframe"><b><i>MediaRecorder.OnErrorListener</i></b></A><br>
+<!-- Class MediaRecorder.OnInfoListener -->
+<A HREF="pkg_android.media.html#MediaRecorder.OnInfoListener" class="hiddenlink" target="rightframe"><b><i>MediaRecorder.OnInfoListener</i></b></A><br>
+<!-- Class MediaRecorder.OutputFormat -->
+<A HREF="android.media.MediaRecorder.OutputFormat.html" class="hiddenlink" target="rightframe">MediaRecorder.OutputFormat</A><br>
+<!-- Class MediaRecorder.VideoEncoder -->
+<A HREF="pkg_android.media.html#MediaRecorder.VideoEncoder" class="hiddenlink" target="rightframe"><b>MediaRecorder.VideoEncoder</b></A><br>
+<!-- Class MediaRecorder.VideoSource -->
+<A HREF="pkg_android.media.html#MediaRecorder.VideoSource" class="hiddenlink" target="rightframe"><b>MediaRecorder.VideoSource</b></A><br>
+<!-- Class MediaStore -->
+<A HREF="android.provider.MediaStore.html" class="hiddenlink" target="rightframe">MediaStore</A><br>
+<!-- Class MediaStore.Audio.AlbumColumns -->
+<A HREF="android.provider.MediaStore.Audio.AlbumColumns.html" class="hiddenlink" target="rightframe"><i>MediaStore.Audio.AlbumColumns</i></A><br>
+<!-- Class MediaStore.Audio.Media -->
+<A HREF="android.provider.MediaStore.Audio.Media.html" class="hiddenlink" target="rightframe">MediaStore.Audio.Media</A><br>
+<!-- Class MediaStore.Images.Media -->
+<A HREF="android.provider.MediaStore.Images.Media.html" class="hiddenlink" target="rightframe">MediaStore.Images.Media</A><br>
+<!-- Class MediaStore.Video -->
+<A HREF="android.provider.MediaStore.Video.html" class="hiddenlink" target="rightframe">MediaStore.Video</A><br>
+<!-- Class MediaStore.Video.VideoColumns -->
+<A HREF="android.provider.MediaStore.Video.VideoColumns.html" class="hiddenlink" target="rightframe"><i>MediaStore.Video.VideoColumns</i></A><br>
+<!-- Class Menu -->
+<A HREF="android.view.Menu.html" class="hiddenlink" target="rightframe"><i>Menu</i></A><br>
+<!-- Class MetaKeyKeyListener -->
+<A HREF="android.text.method.MetaKeyKeyListener.html" class="hiddenlink" target="rightframe">MetaKeyKeyListener</A><br>
+<!-- Class MockPackageManager -->
+<A HREF="android.test.mock.MockPackageManager.html" class="hiddenlink" target="rightframe">MockPackageManager</A><br>
+<!-- Field MODE_APPEND -->
+<nobr><A HREF="android.os.ParcelFileDescriptor.html#android.os.ParcelFileDescriptor.MODE_APPEND" class="hiddenlink" target="rightframe">MODE_APPEND</A>
+</nobr><br>
+<!-- Class MotionEvent -->
+<A HREF="android.view.MotionEvent.html" class="hiddenlink" target="rightframe">MotionEvent</A><br>
+<!-- Field MOUNT_FORMAT_FILESYSTEMS -->
+<nobr><A HREF="android.Manifest.permission.html#android.Manifest.permission.MOUNT_FORMAT_FILESYSTEMS" class="hiddenlink" target="rightframe">MOUNT_FORMAT_FILESYSTEMS</A>
+</nobr><br>
+<!-- Method moveCursorToVisibleOffset -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.moveCursorToVisibleOffset_added()" class="hiddenlink" target="rightframe"><b>moveCursorToVisibleOffset</b>
+()</A></nobr><br>
+<!-- Class MovementMethod -->
+<A HREF="android.text.method.MovementMethod.html" class="hiddenlink" target="rightframe"><i>MovementMethod</i></A><br>
+<!-- Class MultiTapKeyListener -->
+<A HREF="android.text.method.MultiTapKeyListener.html" class="hiddenlink" target="rightframe">MultiTapKeyListener</A><br>
+<!-- Method mutate -->
+<nobr><A HREF="android.graphics.drawable.Drawable.html#android.graphics.drawable.Drawable.mutate_added()" class="hiddenlink" target="rightframe"><b>mutate</b>
+()</A></nobr><br>
+<!-- Field mVerticalAlignment -->
+<nobr><A HREF="android.text.style.DynamicDrawableSpan.html#android.text.style.DynamicDrawableSpan.mVerticalAlignment" class="hiddenlink" target="rightframe">mVerticalAlignment</A>
+</nobr><br>
+<!-- Class NeighboringCellInfo -->
+<A NAME="N"></A>
+<br><font size="+2">N</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="pkg_android.telephony.html#NeighboringCellInfo" class="hiddenlink" target="rightframe"><b>NeighboringCellInfo</b></A><br>
+<!-- Field NETWORK_PREFERENCE -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.NETWORK_PREFERENCE" class="hiddenlink" target="rightframe">NETWORK_PREFERENCE</A>
+</nobr><br>
+<!-- Class NetworkInfo -->
+<i>NetworkInfo</i><br>
+&nbsp;&nbsp;<A HREF="android.net.NetworkInfo.html" class="hiddenlink" target="rightframe">android.net</A><br>
+<!-- Constructor NetworkInfo -->
+&nbsp;&nbsp;<nobr><A HREF="android.net.NetworkInfo.html#android.net.NetworkInfo.ctor_removed(int)" class="hiddenlink" target="rightframe"><strike>NetworkInfo</strike>
+(<code>int</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Class NoCopySpan -->
+<A HREF="pkg_android.text.html#NoCopySpan" class="hiddenlink" target="rightframe"><b><i>NoCopySpan</i></b></A><br>
+<!-- Class NoCopySpan.Concrete -->
+<A HREF="pkg_android.text.html#NoCopySpan.Concrete" class="hiddenlink" target="rightframe"><b>NoCopySpan.Concrete</b></A><br>
+<!-- Field noHistory -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.noHistory" class="hiddenlink" target="rightframe">noHistory</A>
+</nobr><br>
+<!-- Field NUM_STREAMS -->
+<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.NUM_STREAMS" class="hiddenlink" target="rightframe">NUM_STREAMS</A>
+</nobr><br>
+<!-- Field NUMBER_OF_SONGS_FOR_ARTIST -->
+<nobr><A HREF="android.provider.MediaStore.Audio.AlbumColumns.html#android.provider.MediaStore.Audio.AlbumColumns.NUMBER_OF_SONGS_FOR_ARTIST" class="hiddenlink" target="rightframe">NUMBER_OF_SONGS_FOR_ARTIST</A>
+</nobr><br>
+<!-- Field numeric -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.numeric" class="hiddenlink" target="rightframe">numeric</A>
+</nobr><br>
+<!-- Method onBeginBatchEdit -->
+<A NAME="O"></A>
+<br><font size="+2">O</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.onBeginBatchEdit_added()" class="hiddenlink" target="rightframe"><b>onBeginBatchEdit</b>
+()</A></nobr><br>
+<!-- Method onCheckIsTextEditor -->
+<nobr><A HREF="android.view.View.html#android.view.View.onCheckIsTextEditor_added()" class="hiddenlink" target="rightframe"><b>onCheckIsTextEditor</b>
+()</A></nobr><br>
+<!-- Method onCommitCompletion -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.onCommitCompletion_added(android.view.inputmethod.CompletionInfo)" class="hiddenlink" target="rightframe"><b>onCommitCompletion</b>
+(<code>CompletionInfo</code>)</A></nobr><br>
+<!-- Method onContentChanged -->
+<nobr><A HREF="android.widget.CursorAdapter.html#android.widget.CursorAdapter.onContentChanged_added()" class="hiddenlink" target="rightframe"><b>onContentChanged</b>
+()</A></nobr><br>
+<!-- Method onCreateInputConnection -->
+<nobr><A HREF="android.view.View.html#android.view.View.onCreateInputConnection_added(android.view.inputmethod.EditorInfo)" class="hiddenlink" target="rightframe"><b>onCreateInputConnection</b>
+(<code>EditorInfo</code>)</A></nobr><br>
+<!-- Method onDoubleTap -->
+<nobr><A HREF="android.view.GestureDetector.SimpleOnGestureListener.html#android.view.GestureDetector.SimpleOnGestureListener.onDoubleTap_added(android.view.MotionEvent)" class="hiddenlink" target="rightframe"><b>onDoubleTap</b>
+(<code>MotionEvent</code>)</A></nobr><br>
+<!-- Method onDoubleTapEvent -->
+<nobr><A HREF="android.view.GestureDetector.SimpleOnGestureListener.html#android.view.GestureDetector.SimpleOnGestureListener.onDoubleTapEvent_added(android.view.MotionEvent)" class="hiddenlink" target="rightframe"><b>onDoubleTapEvent</b>
+(<code>MotionEvent</code>)</A></nobr><br>
+<!-- Method onEditorAction -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.onEditorAction_added(int)" class="hiddenlink" target="rightframe"><b>onEditorAction</b>
+(<code>int</code>)</A></nobr><br>
+<!-- Method onEndBatchEdit -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.onEndBatchEdit_added()" class="hiddenlink" target="rightframe"><b>onEndBatchEdit</b>
+()</A></nobr><br>
+<!-- Method onFinishTemporaryDetach -->
+<nobr><A HREF="android.view.View.html#android.view.View.onFinishTemporaryDetach_added()" class="hiddenlink" target="rightframe"><b>onFinishTemporaryDetach</b>
+()</A></nobr><br>
+<!-- Method onGlobalFocusChanged -->
+<nobr><A HREF="android.webkit.WebView.html#android.webkit.WebView.onGlobalFocusChanged_changed(android.view.View, android.view.View)" class="hiddenlink" target="rightframe">onGlobalFocusChanged
+(<code>View, View</code>)</A></nobr><br>
+<!-- Method onKeyOther -->
+<i>onKeyOther</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.ArrowKeyMovementMethod.html#android.text.method.ArrowKeyMovementMethod.onKeyOther_added(android.widget.TextView, android.text.Spannable, android.view.KeyEvent)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>TextView, Spannable, KeyEvent</code>)</b>&nbsp;in&nbsp;android.text.method.ArrowKeyMovementMethod
+</A></nobr><br>
+<!-- Method onKeyOther -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.BaseKeyListener.html#android.text.method.BaseKeyListener.onKeyOther_added(android.view.View, android.text.Editable, android.view.KeyEvent)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>View, Editable, KeyEvent</code>)</b>&nbsp;in&nbsp;android.text.method.BaseKeyListener
+</A></nobr><br>
+<!-- Method onKeyOther -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.KeyListener.html#android.text.method.KeyListener.onKeyOther_added(android.view.View, android.text.Editable, android.view.KeyEvent)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>View, Editable, KeyEvent</code>)</b>&nbsp;in&nbsp;android.text.method.KeyListener
+</A></nobr><br>
+<!-- Method onKeyOther -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.MovementMethod.html#android.text.method.MovementMethod.onKeyOther_added(android.widget.TextView, android.text.Spannable, android.view.KeyEvent)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>TextView, Spannable, KeyEvent</code>)</b>&nbsp;in&nbsp;android.text.method.MovementMethod
+</A></nobr><br>
+<!-- Method onKeyOther -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.ScrollingMovementMethod.html#android.text.method.ScrollingMovementMethod.onKeyOther_added(android.widget.TextView, android.text.Spannable, android.view.KeyEvent)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>TextView, Spannable, KeyEvent</code>)</b>&nbsp;in&nbsp;android.text.method.ScrollingMovementMethod
+</A></nobr><br>
+<!-- Method onKeyPreIme -->
+<nobr><A HREF="android.view.View.html#android.view.View.onKeyPreIme_added(int, android.view.KeyEvent)" class="hiddenlink" target="rightframe"><b>onKeyPreIme</b>
+(<code>int, KeyEvent</code>)</A></nobr><br>
+<!-- Method onPrivateIMECommand -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.onPrivateIMECommand_added(java.lang.String, android.os.Bundle)" class="hiddenlink" target="rightframe"><b>onPrivateIMECommand</b>
+(<code>String, Bundle</code>)</A></nobr><br>
+<!-- Method onRestoreInstanceState -->
+<nobr><A HREF="android.widget.ProgressBar.html#android.widget.ProgressBar.onRestoreInstanceState_changed(android.os.Parcelable)" class="hiddenlink" target="rightframe">onRestoreInstanceState
+(<code>Parcelable</code>)</A></nobr><br>
+<!-- Method onSaveInstanceState -->
+<nobr><A HREF="android.widget.ProgressBar.html#android.widget.ProgressBar.onSaveInstanceState_changed()" class="hiddenlink" target="rightframe">onSaveInstanceState
+()</A></nobr><br>
+<!-- Method onSelectionChanged -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.onSelectionChanged_added(int, int)" class="hiddenlink" target="rightframe"><b>onSelectionChanged</b>
+(<code>int, int</code>)</A></nobr><br>
+<!-- Method onSingleTapConfirmed -->
+<nobr><A HREF="android.view.GestureDetector.SimpleOnGestureListener.html#android.view.GestureDetector.SimpleOnGestureListener.onSingleTapConfirmed_added(android.view.MotionEvent)" class="hiddenlink" target="rightframe"><b>onSingleTapConfirmed</b>
+(<code>MotionEvent</code>)</A></nobr><br>
+<!-- Method onStartTemporaryDetach -->
+<nobr><A HREF="android.view.View.html#android.view.View.onStartTemporaryDetach_added()" class="hiddenlink" target="rightframe"><b>onStartTemporaryDetach</b>
+()</A></nobr><br>
+<!-- Method onTextContextMenuItem -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.onTextContextMenuItem_added(int)" class="hiddenlink" target="rightframe"><b>onTextContextMenuItem</b>
+(<code>int</code>)</A></nobr><br>
+<!-- Method onUserInteraction -->
+<nobr><A HREF="android.app.Activity.html#android.app.Activity.onUserInteraction_added()" class="hiddenlink" target="rightframe"><b>onUserInteraction</b>
+()</A></nobr><br>
+<!-- Method onUserLeaveHint -->
+<nobr><A HREF="android.app.Activity.html#android.app.Activity.onUserLeaveHint_added()" class="hiddenlink" target="rightframe"><b>onUserLeaveHint</b>
+()</A></nobr><br>
+<!-- Method openAssetFile -->
+<nobr><A HREF="android.content.ContentProvider.html#android.content.ContentProvider.openAssetFile_added(android.net.Uri, java.lang.String)" class="hiddenlink" target="rightframe"><b>openAssetFile</b>
+(<code>Uri, String</code>)</A></nobr><br>
+<!-- Method openAssetFileDescriptor -->
+<nobr><A HREF="android.content.ContentResolver.html#android.content.ContentResolver.openAssetFileDescriptor_added(android.net.Uri, java.lang.String)" class="hiddenlink" target="rightframe"><b>openAssetFileDescriptor</b>
+(<code>Uri, String</code>)</A></nobr><br>
+<!-- Method openOutputStream -->
+<nobr><A HREF="android.content.ContentResolver.html#android.content.ContentResolver.openOutputStream_added(android.net.Uri, java.lang.String)" class="hiddenlink" target="rightframe"><b>openOutputStream</b>
+(<code>Uri, String</code>)</A></nobr><br>
+<!-- Method openRawResource -->
+<nobr><A HREF="android.content.res.Resources.html#android.content.res.Resources.openRawResource_added(int, android.util.TypedValue)" class="hiddenlink" target="rightframe"><b>openRawResource</b>
+(<code>int, TypedValue</code>)</A></nobr><br>
+<!-- Class OrientationEventListener -->
+<A HREF="pkg_android.view.html#OrientationEventListener" class="hiddenlink" target="rightframe"><b>OrientationEventListener</b></A><br>
+<!-- Class OrientationListener -->
+<i>OrientationListener</i><br>
+&nbsp;&nbsp;<A HREF="android.view.OrientationListener.html" class="hiddenlink" target="rightframe">android.view</A><br>
+<!-- Constructor OrientationListener -->
+&nbsp;&nbsp;<nobr><A HREF="android.view.OrientationListener.html#android.view.OrientationListener.ctor_added(android.content.Context, int)" class="hiddenlink" target="rightframe"><b>OrientationListener</b>
+(<code>Context, int</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Class Pack200.Packer -->
+<A NAME="P"></A>
+<br><font size="+2">P</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="java.util.jar.Pack200.Packer.html" class="hiddenlink" target="rightframe"><i>Pack200.Packer</i></A><br>
+<!-- Class Pack200.Unpacker -->
+<A HREF="java.util.jar.Pack200.Unpacker.html" class="hiddenlink" target="rightframe"><i>Pack200.Unpacker</i></A><br>
+<!-- Class PackageInfo -->
+<A HREF="android.content.pm.PackageInfo.html" class="hiddenlink" target="rightframe">PackageInfo</A><br>
+<!-- Class PackageManager -->
+<A HREF="android.content.pm.PackageManager.html" class="hiddenlink" target="rightframe">PackageManager</A><br>
+<!-- Class Parcel -->
+<A HREF="android.os.Parcel.html" class="hiddenlink" target="rightframe">Parcel</A><br>
+<!-- Class ParcelableSpan -->
+<A HREF="pkg_android.text.html#ParcelableSpan" class="hiddenlink" target="rightframe"><b><i>ParcelableSpan</i></b></A><br>
+<!-- Class ParcelFileDescriptor -->
+<A HREF="android.os.ParcelFileDescriptor.html" class="hiddenlink" target="rightframe">ParcelFileDescriptor</A><br>
+<!-- Field PARENTAL_CONTROL_ENABLED -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.PARENTAL_CONTROL_ENABLED" class="hiddenlink" target="rightframe">PARENTAL_CONTROL_ENABLED</A>
+</nobr><br>
+<!-- Field PARENTAL_CONTROL_LAST_UPDATE -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.PARENTAL_CONTROL_LAST_UPDATE" class="hiddenlink" target="rightframe">PARENTAL_CONTROL_LAST_UPDATE</A>
+</nobr><br>
+<!-- Field PARENTAL_CONTROL_REDIRECT_URL -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.PARENTAL_CONTROL_REDIRECT_URL" class="hiddenlink" target="rightframe">PARENTAL_CONTROL_REDIRECT_URL</A>
+</nobr><br>
+<!-- Method parse -->
+<nobr><A HREF="java.util.logging.Level.html#java.util.logging.Level.parse_changed(java.lang.String)" class="hiddenlink" target="rightframe">parse
+(<code>String</code>)</A></nobr><br>
+<!-- Method parseBundleExtra -->
+<nobr><A HREF="android.content.res.Resources.html#android.content.res.Resources.parseBundleExtra_added(java.lang.String, android.util.AttributeSet, android.os.Bundle)" class="hiddenlink" target="rightframe"><b>parseBundleExtra</b>
+(<code>String, AttributeSet, Bundle</code>)</A></nobr><br>
+<!-- Method parseBundleExtras -->
+<nobr><A HREF="android.content.res.Resources.html#android.content.res.Resources.parseBundleExtras_added(android.content.res.XmlResourceParser, android.os.Bundle)" class="hiddenlink" target="rightframe"><b>parseBundleExtras</b>
+(<code>XmlResourceParser, Bundle</code>)</A></nobr><br>
+<!-- Field password -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.password" class="hiddenlink" target="rightframe">password</A>
+</nobr><br>
+<!-- Field paste -->
+<nobr><A HREF="android.R.id.html#android.R.id.paste" class="hiddenlink" target="rightframe">paste</A>
+</nobr><br>
+<!-- Method peekService -->
+<nobr><A HREF="android.content.BroadcastReceiver.html#android.content.BroadcastReceiver.peekService_added(android.content.Context, android.content.Intent)" class="hiddenlink" target="rightframe"><b>peekService</b>
+(<code>Context, Intent</code>)</A></nobr><br>
+<!-- Class PendingIntent -->
+<A HREF="android.app.PendingIntent.html" class="hiddenlink" target="rightframe">PendingIntent</A><br>
+<!-- Method performHapticFeedback -->
+<i>performHapticFeedback</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.view.View.html#android.view.View.performHapticFeedback_added(int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>int</code>)</b>&nbsp;in&nbsp;android.view.View
+</A></nobr><br>
+<!-- Method performHapticFeedback -->
+&nbsp;&nbsp;<nobr><A HREF="android.view.View.html#android.view.View.performHapticFeedback_added(int, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>int, int</code>)</b>&nbsp;in&nbsp;android.view.View
+</A></nobr><br>
+<!-- Field phoneNumber -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.phoneNumber" class="hiddenlink" target="rightframe">phoneNumber</A>
+</nobr><br>
+<!-- Class PhoneNumberUtils -->
+<A HREF="android.telephony.PhoneNumberUtils.html" class="hiddenlink" target="rightframe">PhoneNumberUtils</A><br>
+<!-- Field PHONETIC_NAME -->
+<i>PHONETIC_NAME</i><br>
+&nbsp;in&nbsp;
+<nobr><A HREF="android.provider.Contacts.Intents.Insert.html#android.provider.Contacts.Intents.Insert.PHONETIC_NAME" class="hiddenlink" target="rightframe">android.provider.Contacts.Intents.Insert</A>
+</nobr><br>
+<!-- Field PHONETIC_NAME -->
+&nbsp;in&nbsp;
+<nobr><A HREF="android.provider.Contacts.PeopleColumns.html#android.provider.Contacts.PeopleColumns.PHONETIC_NAME" class="hiddenlink" target="rightframe">android.provider.Contacts.PeopleColumns</A>
+</nobr><br>
+<!-- Method playSoundEffect -->
+<i>playSoundEffect</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.playSoundEffect_added(int, float)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>int, float</code>)</b>&nbsp;in&nbsp;android.media.AudioManager
+</A></nobr><br>
+<!-- Method playSoundEffect -->
+&nbsp;&nbsp;<nobr><A HREF="android.view.View.html#android.view.View.playSoundEffect_changed(int)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>int</code>)&nbsp;in&nbsp;android.view.View
+</A></nobr><br>
+<!-- Class PluginData -->
+<A HREF="pkg_android.webkit.html#PluginData" class="hiddenlink" target="rightframe"><b>PluginData</b></A><br>
+<!-- Field popupCharacters -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.popupCharacters" class="hiddenlink" target="rightframe">popupCharacters</A>
+</nobr><br>
+<!-- Field popupKeyboard -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.popupKeyboard" class="hiddenlink" target="rightframe">popupKeyboard</A>
+</nobr><br>
+<!-- Field popupLayout -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.popupLayout" class="hiddenlink" target="rightframe">popupLayout</A>
+</nobr><br>
+<!-- Class PopupWindow -->
+<A HREF="android.widget.PopupWindow.html" class="hiddenlink" target="rightframe">PopupWindow</A><br>
+<!-- Class PopupWindow.OnDismissListener -->
+<A HREF="android.widget.PopupWindow.OnDismissListener.html" class="hiddenlink" target="rightframe"><i>PopupWindow.OnDismissListener</i></A><br>
+<!-- Method prepare -->
+<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.prepare_changed()" class="hiddenlink" target="rightframe">prepare
+()</A></nobr><br>
+<!-- Class PrintStreamPrinter -->
+<A HREF="pkg_android.util.html#PrintStreamPrinter" class="hiddenlink" target="rightframe"><b>PrintStreamPrinter</b></A><br>
+<!-- Field privateImeOptions -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.privateImeOptions" class="hiddenlink" target="rightframe">privateImeOptions</A>
+</nobr><br>
+<!-- Class ProgressBar -->
+<A HREF="android.widget.ProgressBar.html" class="hiddenlink" target="rightframe">ProgressBar</A><br>
+<!-- Class ProviderTestCase -->
+<A HREF="android.test.ProviderTestCase.html" class="hiddenlink" target="rightframe">ProviderTestCase</A><br>
+<!-- Class ProviderTestCase2 -->
+<A HREF="pkg_android.test.html#ProviderTestCase2" class="hiddenlink" target="rightframe"><b>ProviderTestCase2</b></A><br>
+<!-- Class Proxy -->
+<A HREF="java.lang.reflect.Proxy.html" class="hiddenlink" target="rightframe">Proxy</A><br>
+<!-- Method putLong -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.putLong_added(android.content.ContentResolver, java.lang.String, long)" class="hiddenlink" target="rightframe"><b>putLong</b>
+(<code>ContentResolver, String, long</code>)</A></nobr><br>
+<!-- Class QuoteSpan -->
+<A NAME="Q"></A>
+<br><font size="+2">Q</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<i>QuoteSpan</i><br>
+&nbsp;&nbsp;<A HREF="android.text.style.QuoteSpan.html" class="hiddenlink" target="rightframe">android.text.style</A><br>
+<!-- Constructor QuoteSpan -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.QuoteSpan.html#android.text.style.QuoteSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>QuoteSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Class QwertyKeyListener -->
+<A HREF="android.text.method.QwertyKeyListener.html" class="hiddenlink" target="rightframe">QwertyKeyListener</A><br>
+<!-- Class R.attr -->
+<A NAME="R"></A>
+<br><font size="+2">R</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.R.attr.html" class="hiddenlink" target="rightframe">R.attr</A><br>
+<!-- Class R.bool -->
+<A HREF="pkg_android.html#R.bool" class="hiddenlink" target="rightframe"><b>R.bool</b></A><br>
+<!-- Class R.drawable -->
+<A HREF="android.R.drawable.html" class="hiddenlink" target="rightframe">R.drawable</A><br>
+<!-- Class R.id -->
+<A HREF="android.R.id.html" class="hiddenlink" target="rightframe">R.id</A><br>
+<!-- Class R.integer -->
+<A HREF="pkg_android.html#R.integer" class="hiddenlink" target="rightframe"><b>R.integer</b></A><br>
+<!-- Class R.string -->
+<A HREF="android.R.string.html" class="hiddenlink" target="rightframe">R.string</A><br>
+<!-- Class R.style -->
+<A HREF="android.R.style.html" class="hiddenlink" target="rightframe">R.style</A><br>
+<!-- Class RasterizerSpan -->
+<A HREF="android.text.style.RasterizerSpan.html" class="hiddenlink" target="rightframe">RasterizerSpan</A><br>
+<!-- Field RAW_AMR -->
+<nobr><A HREF="android.media.MediaRecorder.OutputFormat.html#android.media.MediaRecorder.OutputFormat.RAW_AMR" class="hiddenlink" target="rightframe">RAW_AMR</A>
+</nobr><br>
+<!-- Field RAW_DATA_INDEX -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.RAW_DATA_INDEX" class="hiddenlink" target="rightframe">RAW_DATA_INDEX</A>
+</nobr><br>
+<!-- Field RAW_DATA_X -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.RAW_DATA_X" class="hiddenlink" target="rightframe">RAW_DATA_X</A>
+</nobr><br>
+<!-- Field RAW_DATA_Y -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.RAW_DATA_Y" class="hiddenlink" target="rightframe">RAW_DATA_Y</A>
+</nobr><br>
+<!-- Field RAW_DATA_Z -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.RAW_DATA_Z" class="hiddenlink" target="rightframe">RAW_DATA_Z</A>
+</nobr><br>
+<!-- Method readFromParcel -->
+<nobr><A HREF="android.graphics.RectF.html#android.graphics.RectF.readFromParcel_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>readFromParcel</b>
+(<code>Parcel</code>)</A></nobr><br>
+<!-- Method readHashMap -->
+<nobr><A HREF="android.os.Parcel.html#android.os.Parcel.readHashMap_changed(java.lang.ClassLoader)" class="hiddenlink" target="rightframe">readHashMap
+(<code>ClassLoader</code>)</A></nobr><br>
+<!-- Method readMap -->
+<nobr><A HREF="android.os.Parcel.html#android.os.Parcel.readMap_changed(java.util.Map, java.lang.ClassLoader)" class="hiddenlink" target="rightframe">readMap
+(<code>Map, ClassLoader</code>)</A></nobr><br>
+<!-- Class Rect -->
+<A HREF="android.graphics.Rect.html" class="hiddenlink" target="rightframe">Rect</A><br>
+<!-- Class RectF -->
+<A HREF="android.graphics.RectF.html" class="hiddenlink" target="rightframe">RectF</A><br>
+<!-- Method registerListener -->
+<i>registerListener</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.registerListener_added(android.hardware.SensorEventListener, android.hardware.Sensor, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>SensorEventListener, Sensor, int</code>)</b>&nbsp;in&nbsp;android.hardware.SensorManager
+</A></nobr><br>
+<!-- Method registerListener -->
+&nbsp;&nbsp;<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.registerListener_added(android.hardware.SensorEventListener, android.hardware.Sensor, int, android.os.Handler)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>SensorEventListener, Sensor, int, Handler</code>)</b>&nbsp;in&nbsp;android.hardware.SensorManager
+</A></nobr><br>
+<!-- Method registerListener -->
+&nbsp;&nbsp;<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.registerListener_changed(android.hardware.SensorListener, int)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>SensorListener, int</code>)&nbsp;in&nbsp;android.hardware.SensorManager
+</A></nobr><br>
+<!-- Method registerListener -->
+&nbsp;&nbsp;<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.registerListener_changed(android.hardware.SensorListener, int, int)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>SensorListener, int, int</code>)&nbsp;in&nbsp;android.hardware.SensorManager
+</A></nobr><br>
+<!-- Class RelativeSizeSpan -->
+<i>RelativeSizeSpan</i><br>
+&nbsp;&nbsp;<A HREF="android.text.style.RelativeSizeSpan.html" class="hiddenlink" target="rightframe">android.text.style</A><br>
+<!-- Constructor RelativeSizeSpan -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.RelativeSizeSpan.html#android.text.style.RelativeSizeSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>RelativeSizeSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Method remapCoordinateSystem -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.remapCoordinateSystem_added(float[], int, int, float[])" class="hiddenlink" target="rightframe"><b>remapCoordinateSystem</b>
+(<code>float[], int, int, float[]</code>)</A></nobr><br>
+<!-- Class RemoteViews -->
+<A HREF="android.widget.RemoteViews.html" class="hiddenlink" target="rightframe">RemoteViews</A><br>
+<!-- Class RemoteViews.ActionException -->
+<i>RemoteViews.ActionException</i><br>
+&nbsp;&nbsp;<A HREF="android.widget.RemoteViews.ActionException.html" class="hiddenlink" target="rightframe">android.widget</A><br>
+<!-- Constructor RemoteViews.ActionException -->
+&nbsp;&nbsp;<nobr><A HREF="android.widget.RemoteViews.ActionException.html#android.widget.RemoteViews.ActionException.ctor_added(java.lang.Exception)" class="hiddenlink" target="rightframe"><b>RemoteViews.ActionException</b>
+(<code>Exception</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Method removeAt -->
+<nobr><A HREF="android.util.SparseIntArray.html#android.util.SparseIntArray.removeAt_added(int)" class="hiddenlink" target="rightframe"><b>removeAt</b>
+(<code>int</code>)</A></nobr><br>
+<!-- Method removeGpsStatusListener -->
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.removeGpsStatusListener_added(android.location.GpsStatus.Listener)" class="hiddenlink" target="rightframe"><b>removeGpsStatusListener</b>
+(<code>Listener</code>)</A></nobr><br>
+<!-- Method removeOnScrollChangedListener -->
+<nobr><A HREF="android.view.ViewTreeObserver.html#android.view.ViewTreeObserver.removeOnScrollChangedListener_added(android.view.ViewTreeObserver.OnScrollChangedListener)" class="hiddenlink" target="rightframe"><b>removeOnScrollChangedListener</b>
+(<code>OnScrollChangedListener</code>)</A></nobr><br>
+<!-- Method removePropertyChangeListener -->
+<i>removePropertyChangeListener</i><br>
+&nbsp;&nbsp;<nobr><A HREF="java.util.jar.Pack200.Packer.html#java.util.jar.Pack200.Packer.removePropertyChangeListener_added(java.beans.PropertyChangeListener)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>PropertyChangeListener</code>)</b>&nbsp;in&nbsp;java.util.jar.Pack200.Packer
+</A></nobr><br>
+<!-- Method removePropertyChangeListener -->
+&nbsp;&nbsp;<nobr><A HREF="java.util.jar.Pack200.Unpacker.html#java.util.jar.Pack200.Unpacker.removePropertyChangeListener_added(java.beans.PropertyChangeListener)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>PropertyChangeListener</code>)</b>&nbsp;in&nbsp;java.util.jar.Pack200.Unpacker
+</A></nobr><br>
+<!-- Method removePropertyChangeListener -->
+&nbsp;&nbsp;<nobr><A HREF="java.util.logging.LogManager.html#java.util.logging.LogManager.removePropertyChangeListener_added(java.beans.PropertyChangeListener)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>PropertyChangeListener</code>)</b>&nbsp;in&nbsp;java.util.logging.LogManager
+</A></nobr><br>
+<!-- Method removeTestProvider -->
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.removeTestProvider_added(java.lang.String)" class="hiddenlink" target="rightframe"><b>removeTestProvider</b>
+(<code>String</code>)</A></nobr><br>
+<!-- Method removeUpdates -->
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.removeUpdates_added(android.app.PendingIntent)" class="hiddenlink" target="rightframe"><b>removeUpdates</b>
+(<code>PendingIntent</code>)</A></nobr><br>
+<!-- Method replaceExtras -->
+<i>replaceExtras</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.content.Intent.html#android.content.Intent.replaceExtras_added(android.content.Intent)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Intent</code>)</b>&nbsp;in&nbsp;android.content.Intent
+</A></nobr><br>
+<!-- Method replaceExtras -->
+&nbsp;&nbsp;<nobr><A HREF="android.content.Intent.html#android.content.Intent.replaceExtras_added(android.os.Bundle)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Bundle</code>)</b>&nbsp;in&nbsp;android.content.Intent
+</A></nobr><br>
+<!-- Field reqFiveWayNav -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.reqFiveWayNav" class="hiddenlink" target="rightframe">reqFiveWayNav</A>
+</nobr><br>
+<!-- Field reqHardKeyboard -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.reqHardKeyboard" class="hiddenlink" target="rightframe">reqHardKeyboard</A>
+</nobr><br>
+<!-- Field reqKeyboardType -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.reqKeyboardType" class="hiddenlink" target="rightframe">reqKeyboardType</A>
+</nobr><br>
+<!-- Field reqNavigation -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.reqNavigation" class="hiddenlink" target="rightframe">reqNavigation</A>
+</nobr><br>
+<!-- Field reqTouchScreen -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.reqTouchScreen" class="hiddenlink" target="rightframe">reqTouchScreen</A>
+</nobr><br>
+<!-- Method requestChildRectangleOnScreen -->
+<nobr><A HREF="android.view.ViewParent.html#android.view.ViewParent.requestChildRectangleOnScreen_added(android.view.View, android.graphics.Rect, boolean)" class="hiddenlink" target="rightframe"><b>requestChildRectangleOnScreen</b>
+(<code>View, Rect, boolean</code>)</A></nobr><br>
+<!-- Method requestLocationUpdates -->
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.requestLocationUpdates_added(java.lang.String, long, float, android.app.PendingIntent)" class="hiddenlink" target="rightframe"><b>requestLocationUpdates</b>
+(<code>String, long, float, PendingIntent</code>)</A></nobr><br>
+<!-- Method resetLockedMeta -->
+<nobr><A HREF="android.text.method.MetaKeyKeyListener.html#android.text.method.MetaKeyKeyListener.resetLockedMeta_added(long)" class="hiddenlink" target="rightframe"><b>resetLockedMeta</b>
+(<code>long</code>)</A></nobr><br>
+<!-- Class ResourceCursorAdapter -->
+<i>ResourceCursorAdapter</i><br>
+&nbsp;&nbsp;<A HREF="android.widget.ResourceCursorAdapter.html" class="hiddenlink" target="rightframe">android.widget</A><br>
+<!-- Constructor ResourceCursorAdapter -->
+&nbsp;&nbsp;<nobr><A HREF="android.widget.ResourceCursorAdapter.html#android.widget.ResourceCursorAdapter.ctor_added(android.content.Context, int, android.database.Cursor, boolean)" class="hiddenlink" target="rightframe"><b>ResourceCursorAdapter</b>
+(<code>Context, int, Cursor, boolean</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Class Resources -->
+<A HREF="android.content.res.Resources.html" class="hiddenlink" target="rightframe">Resources</A><br>
+<!-- Method restartPackage -->
+<nobr><A HREF="android.app.ActivityManager.html#android.app.ActivityManager.restartPackage_added(java.lang.String)" class="hiddenlink" target="rightframe"><b>restartPackage</b>
+(<code>String</code>)</A></nobr><br>
+<!-- Method restorePicture -->
+<nobr><A HREF="android.webkit.WebView.html#android.webkit.WebView.restorePicture_added(android.os.Bundle, java.io.File)" class="hiddenlink" target="rightframe"><b>restorePicture</b>
+(<code>Bundle, File</code>)</A></nobr><br>
+<!-- Class ResultReceiver -->
+<A HREF="pkg_android.os.html#ResultReceiver" class="hiddenlink" target="rightframe"><b>ResultReceiver</b></A><br>
+<!-- Class RingtoneManager -->
+<A HREF="android.media.RingtoneManager.html" class="hiddenlink" target="rightframe">RingtoneManager</A><br>
+<!-- Class RotateDrawable -->
+<A HREF="android.graphics.drawable.RotateDrawable.html" class="hiddenlink" target="rightframe">RotateDrawable</A><br>
+<!-- Field ROUTE_BLUETOOTH -->
+<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.ROUTE_BLUETOOTH" class="hiddenlink" target="rightframe">ROUTE_BLUETOOTH</A>
+</nobr><br>
+<!-- Field ROUTE_BLUETOOTH_A2DP -->
+<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.ROUTE_BLUETOOTH_A2DP" class="hiddenlink" target="rightframe">ROUTE_BLUETOOTH_A2DP</A>
+</nobr><br>
+<!-- Field ROUTE_BLUETOOTH_SCO -->
+<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.ROUTE_BLUETOOTH_SCO" class="hiddenlink" target="rightframe">ROUTE_BLUETOOTH_SCO</A>
+</nobr><br>
+<!-- Field rowEdgeFlags -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.rowEdgeFlags" class="hiddenlink" target="rightframe">rowEdgeFlags</A>
+</nobr><br>
+<!-- Method runTestOnUiThread -->
+<nobr><A HREF="android.test.InstrumentationTestCase.html#android.test.InstrumentationTestCase.runTestOnUiThread_added(java.lang.Runnable)" class="hiddenlink" target="rightframe"><b>runTestOnUiThread</b>
+(<code>Runnable</code>)</A></nobr><br>
+<!-- Method savePicture -->
+<A NAME="S"></A>
+<br><font size="+2">S</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.webkit.WebView.html#android.webkit.WebView.savePicture_added(android.os.Bundle, java.io.File)" class="hiddenlink" target="rightframe"><b>savePicture</b>
+(<code>Bundle, File</code>)</A></nobr><br>
+<!-- Class ScaleDrawable -->
+<A HREF="android.graphics.drawable.ScaleDrawable.html" class="hiddenlink" target="rightframe">ScaleDrawable</A><br>
+<!-- Class ScaleXSpan -->
+<i>ScaleXSpan</i><br>
+&nbsp;&nbsp;<A HREF="android.text.style.ScaleXSpan.html" class="hiddenlink" target="rightframe">android.text.style</A><br>
+<!-- Constructor ScaleXSpan -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.ScaleXSpan.html#android.text.style.ScaleXSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>ScaleXSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Field SCREEN_BRIGHTNESS_CHANGED -->
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SCREEN_BRIGHTNESS_CHANGED" class="hiddenlink" target="rightframe">SCREEN_BRIGHTNESS_CHANGED</A>
+</nobr><br>
+<!-- Field SCREEN_ORIENTATION_CHANGED -->
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SCREEN_ORIENTATION_CHANGED" class="hiddenlink" target="rightframe">SCREEN_ORIENTATION_CHANGED</A>
+</nobr><br>
+<!-- Field screenBrightness -->
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.screenBrightness" class="hiddenlink" target="rightframe">screenBrightness</A>
+</nobr><br>
+<!-- Field screenOrientation -->
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.screenOrientation" class="hiddenlink" target="rightframe">screenOrientation</A>
+</nobr><br>
+<!-- Class Scroller -->
+<A HREF="android.widget.Scroller.html" class="hiddenlink" target="rightframe">Scroller</A><br>
+<!-- Class ScrollingMovementMethod -->
+<A HREF="android.text.method.ScrollingMovementMethod.html" class="hiddenlink" target="rightframe">ScrollingMovementMethod</A><br>
+<!-- Method scrollToBottom -->
+<i>scrollToBottom</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.scrollToBottom_added(android.test.InstrumentationTestCase, android.app.Activity, android.view.ViewGroup)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>InstrumentationTestCase, Activity, ViewGroup</code>)</b>&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+<!-- Method scrollToBottom -->
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.scrollToBottom_changed(android.test.ActivityInstrumentationTestCase, android.view.ViewGroup)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>ActivityInstrumentationTestCase, ViewGroup</code>)&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+<!-- Method scrollToTop -->
+<i>scrollToTop</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.scrollToTop_added(android.test.InstrumentationTestCase, android.app.Activity, android.view.ViewGroup)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>InstrumentationTestCase, Activity, ViewGroup</code>)</b>&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+<!-- Method scrollToTop -->
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.scrollToTop_changed(android.test.ActivityInstrumentationTestCase, android.view.ViewGroup)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>ActivityInstrumentationTestCase, ViewGroup</code>)&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+<!-- Field searchButtonText -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.searchButtonText" class="hiddenlink" target="rightframe">searchButtonText</A>
+</nobr><br>
+<!-- Field SECONDARY_EMAIL -->
+<nobr><A HREF="android.provider.Contacts.Intents.Insert.html#android.provider.Contacts.Intents.Insert.SECONDARY_EMAIL" class="hiddenlink" target="rightframe">SECONDARY_EMAIL</A>
+</nobr><br>
+<!-- Field SECONDARY_EMAIL_TYPE -->
+<nobr><A HREF="android.provider.Contacts.Intents.Insert.html#android.provider.Contacts.Intents.Insert.SECONDARY_EMAIL_TYPE" class="hiddenlink" target="rightframe">SECONDARY_EMAIL_TYPE</A>
+</nobr><br>
+<!-- Field SECONDARY_PHONE -->
+<nobr><A HREF="android.provider.Contacts.Intents.Insert.html#android.provider.Contacts.Intents.Insert.SECONDARY_PHONE" class="hiddenlink" target="rightframe">SECONDARY_PHONE</A>
+</nobr><br>
+<!-- Field SECONDARY_PHONE_TYPE -->
+<nobr><A HREF="android.provider.Contacts.Intents.Insert.html#android.provider.Contacts.Intents.Insert.SECONDARY_PHONE_TYPE" class="hiddenlink" target="rightframe">SECONDARY_PHONE_TYPE</A>
+</nobr><br>
+<!-- Class SectionIndexer -->
+<A HREF="pkg_android.widget.html#SectionIndexer" class="hiddenlink" target="rightframe"><b><i>SectionIndexer</i></b></A><br>
+<!-- Field selectAll -->
+<nobr><A HREF="android.R.id.html#android.R.id.selectAll" class="hiddenlink" target="rightframe">selectAll</A>
+</nobr><br>
+<!-- Method sendExtraCommand -->
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.sendExtraCommand_added(java.lang.String, java.lang.String, android.os.Bundle)" class="hiddenlink" target="rightframe"><b>sendExtraCommand</b>
+(<code>String, String, Bundle</code>)</A></nobr><br>
+<!-- Class Sensor -->
+<A HREF="pkg_android.hardware.html#Sensor" class="hiddenlink" target="rightframe"><b>Sensor</b></A><br>
+<!-- Field SENSOR_ACCELEROMETER -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.SENSOR_ACCELEROMETER" class="hiddenlink" target="rightframe">SENSOR_ACCELEROMETER</A>
+</nobr><br>
+<!-- Field SENSOR_ALL -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.SENSOR_ALL" class="hiddenlink" target="rightframe">SENSOR_ALL</A>
+</nobr><br>
+<!-- Field SENSOR_LIGHT -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.SENSOR_LIGHT" class="hiddenlink" target="rightframe">SENSOR_LIGHT</A>
+</nobr><br>
+<!-- Field SENSOR_MAGNETIC_FIELD -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.SENSOR_MAGNETIC_FIELD" class="hiddenlink" target="rightframe">SENSOR_MAGNETIC_FIELD</A>
+</nobr><br>
+<!-- Field SENSOR_MAX -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.SENSOR_MAX" class="hiddenlink" target="rightframe">SENSOR_MAX</A>
+</nobr><br>
+<!-- Field SENSOR_MIN -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.SENSOR_MIN" class="hiddenlink" target="rightframe">SENSOR_MIN</A>
+</nobr><br>
+<!-- Field SENSOR_ORIENTATION -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.SENSOR_ORIENTATION" class="hiddenlink" target="rightframe">SENSOR_ORIENTATION</A>
+</nobr><br>
+<!-- Field SENSOR_ORIENTATION_RAW -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.SENSOR_ORIENTATION_RAW" class="hiddenlink" target="rightframe">SENSOR_ORIENTATION_RAW</A>
+</nobr><br>
+<!-- Field SENSOR_PROXIMITY -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.SENSOR_PROXIMITY" class="hiddenlink" target="rightframe">SENSOR_PROXIMITY</A>
+</nobr><br>
+<!-- Field SENSOR_TEMPERATURE -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.SENSOR_TEMPERATURE" class="hiddenlink" target="rightframe">SENSOR_TEMPERATURE</A>
+</nobr><br>
+<!-- Field SENSOR_TRICORDER -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.SENSOR_TRICORDER" class="hiddenlink" target="rightframe">SENSOR_TRICORDER</A>
+</nobr><br>
+<!-- Class SensorEvent -->
+<A HREF="pkg_android.hardware.html#SensorEvent" class="hiddenlink" target="rightframe"><b>SensorEvent</b></A><br>
+<!-- Class SensorEventListener -->
+<A HREF="pkg_android.hardware.html#SensorEventListener" class="hiddenlink" target="rightframe"><b><i>SensorEventListener</i></b></A><br>
+<!-- Class SensorListener -->
+<A HREF="android.hardware.SensorListener.html" class="hiddenlink" target="rightframe"><i>SensorListener</i></A><br>
+<!-- Class SensorManager -->
+<A HREF="android.hardware.SensorManager.html" class="hiddenlink" target="rightframe">SensorManager</A><br>
+<!-- Method service -->
+<nobr><A HREF="android.webkit.UrlInterceptHandler.html#android.webkit.UrlInterceptHandler.service_changed(java.lang.String, java.util.Map<java.lang.String, java.lang.String>)" class="hiddenlink" target="rightframe">service
+(<code>String, Map&lt;String, String&gt;</code>)</A></nobr><br>
+<!-- Method setAllowFileAccess -->
+<nobr><A HREF="android.webkit.WebSettings.html#android.webkit.WebSettings.setAllowFileAccess_added(boolean)" class="hiddenlink" target="rightframe"><b>setAllowFileAccess</b>
+(<code>boolean</code>)</A></nobr><br>
+<!-- Method setBitmap -->
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setBitmap_added(int, java.lang.String, android.graphics.Bitmap)" class="hiddenlink" target="rightframe"><b>setBitmap</b>
+(<code>int, String, Bitmap</code>)</A></nobr><br>
+<!-- Method setBluetoothA2dpOn -->
+<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.setBluetoothA2dpOn_added(boolean)" class="hiddenlink" target="rightframe"><b>setBluetoothA2dpOn</b>
+(<code>boolean</code>)</A></nobr><br>
+<!-- Method setBoolean -->
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setBoolean_added(int, java.lang.String, boolean)" class="hiddenlink" target="rightframe"><b>setBoolean</b>
+(<code>int, String, boolean</code>)</A></nobr><br>
+<!-- Method setBuiltInZoomControls -->
+<nobr><A HREF="android.webkit.WebSettings.html#android.webkit.WebSettings.setBuiltInZoomControls_added(boolean)" class="hiddenlink" target="rightframe"><b>setBuiltInZoomControls</b>
+(<code>boolean</code>)</A></nobr><br>
+<!-- Method setButton -->
+<i>setButton</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.app.AlertDialog.html#android.app.AlertDialog.setButton_added(java.lang.CharSequence, android.content.DialogInterface.OnClickListener)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>CharSequence, OnClickListener</code>)</b>&nbsp;in&nbsp;android.app.AlertDialog
+</A></nobr><br>
+<!-- Method setButton -->
+&nbsp;&nbsp;<nobr><A HREF="android.app.AlertDialog.html#android.app.AlertDialog.setButton_added(java.lang.CharSequence, android.os.Message)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>CharSequence, Message</code>)</b>&nbsp;in&nbsp;android.app.AlertDialog
+</A></nobr><br>
+<!-- Method setButton -->
+&nbsp;&nbsp;<nobr><A HREF="android.app.AlertDialog.html#android.app.AlertDialog.setButton_changed(int, java.lang.CharSequence, android.content.DialogInterface.OnClickListener)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>int, CharSequence, OnClickListener</code>)&nbsp;in&nbsp;android.app.AlertDialog
+</A></nobr><br>
+<!-- Method setButton -->
+&nbsp;&nbsp;<nobr><A HREF="android.app.AlertDialog.html#android.app.AlertDialog.setButton_changed(int, java.lang.CharSequence, android.os.Message)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>int, CharSequence, Message</code>)&nbsp;in&nbsp;android.app.AlertDialog
+</A></nobr><br>
+<!-- Method setButton2 -->
+<i>setButton2</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.app.AlertDialog.html#android.app.AlertDialog.setButton2_changed(java.lang.CharSequence, android.content.DialogInterface.OnClickListener)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>CharSequence, OnClickListener</code>)&nbsp;in&nbsp;android.app.AlertDialog
+</A></nobr><br>
+<!-- Method setButton2 -->
+&nbsp;&nbsp;<nobr><A HREF="android.app.AlertDialog.html#android.app.AlertDialog.setButton2_changed(java.lang.CharSequence, android.os.Message)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>CharSequence, Message</code>)&nbsp;in&nbsp;android.app.AlertDialog
+</A></nobr><br>
+<!-- Method setButton3 -->
+<i>setButton3</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.app.AlertDialog.html#android.app.AlertDialog.setButton3_changed(java.lang.CharSequence, android.content.DialogInterface.OnClickListener)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>CharSequence, OnClickListener</code>)&nbsp;in&nbsp;android.app.AlertDialog
+</A></nobr><br>
+<!-- Method setButton3 -->
+&nbsp;&nbsp;<nobr><A HREF="android.app.AlertDialog.html#android.app.AlertDialog.setButton3_changed(java.lang.CharSequence, android.os.Message)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>CharSequence, Message</code>)&nbsp;in&nbsp;android.app.AlertDialog
+</A></nobr><br>
+<!-- Method setByte -->
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setByte_added(int, java.lang.String, byte)" class="hiddenlink" target="rightframe"><b>setByte</b>
+(<code>int, String, byte</code>)</A></nobr><br>
+<!-- Method setCamera -->
+<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.setCamera_added(android.hardware.Camera)" class="hiddenlink" target="rightframe"><b>setCamera</b>
+(<code>Camera</code>)</A></nobr><br>
+<!-- Method setChar -->
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setChar_added(int, java.lang.String, char)" class="hiddenlink" target="rightframe"><b>setChar</b>
+(<code>int, String, char</code>)</A></nobr><br>
+<!-- Method setCharSequence -->
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setCharSequence_added(int, java.lang.String, java.lang.CharSequence)" class="hiddenlink" target="rightframe"><b>setCharSequence</b>
+(<code>int, String, CharSequence</code>)</A></nobr><br>
+<!-- Method setClippingEnabled -->
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.setClippingEnabled_added(boolean)" class="hiddenlink" target="rightframe"><b>setClippingEnabled</b>
+(<code>boolean</code>)</A></nobr><br>
+<!-- Method setCompoundDrawablesWithIntrinsicBounds -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.setCompoundDrawablesWithIntrinsicBounds_added(int, int, int, int)" class="hiddenlink" target="rightframe"><b>setCompoundDrawablesWithIntrinsicBounds</b>
+(<code>int, int, int, int</code>)</A></nobr><br>
+<!-- Method setDouble -->
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setDouble_added(int, java.lang.String, double)" class="hiddenlink" target="rightframe"><b>setDouble</b>
+(<code>int, String, double</code>)</A></nobr><br>
+<!-- Method setDropDownAnchor -->
+<nobr><A HREF="android.widget.AutoCompleteTextView.html#android.widget.AutoCompleteTextView.setDropDownAnchor_added(int)" class="hiddenlink" target="rightframe"><b>setDropDownAnchor</b>
+(<code>int</code>)</A></nobr><br>
+<!-- Method setDropDownWidth -->
+<nobr><A HREF="android.widget.AutoCompleteTextView.html#android.widget.AutoCompleteTextView.setDropDownWidth_added(int)" class="hiddenlink" target="rightframe"><b>setDropDownWidth</b>
+(<code>int</code>)</A></nobr><br>
+<!-- Method setExtractedText -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.setExtractedText_added(android.view.inputmethod.ExtractedText)" class="hiddenlink" target="rightframe"><b>setExtractedText</b>
+(<code>ExtractedText</code>)</A></nobr><br>
+<!-- Method setFastScrollEnabled -->
+<nobr><A HREF="android.widget.AbsListView.html#android.widget.AbsListView.setFastScrollEnabled_added(boolean)" class="hiddenlink" target="rightframe"><b>setFastScrollEnabled</b>
+(<code>boolean</code>)</A></nobr><br>
+<!-- Method setFillEnabled -->
+<nobr><A HREF="android.view.animation.Animation.html#android.view.animation.Animation.setFillEnabled_added(boolean)" class="hiddenlink" target="rightframe"><b>setFillEnabled</b>
+(<code>boolean</code>)</A></nobr><br>
+<!-- Method setFloat -->
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setFloat_added(int, java.lang.String, float)" class="hiddenlink" target="rightframe"><b>setFloat</b>
+(<code>int, String, float</code>)</A></nobr><br>
+<!-- Method setFooterDividersEnabled -->
+<nobr><A HREF="android.widget.ListView.html#android.widget.ListView.setFooterDividersEnabled_added(boolean)" class="hiddenlink" target="rightframe"><b>setFooterDividersEnabled</b>
+(<code>boolean</code>)</A></nobr><br>
+<!-- Method setHapticFeedbackEnabled -->
+<nobr><A HREF="android.view.View.html#android.view.View.setHapticFeedbackEnabled_added(boolean)" class="hiddenlink" target="rightframe"><b>setHapticFeedbackEnabled</b>
+(<code>boolean</code>)</A></nobr><br>
+<!-- Method setHeaderDividersEnabled -->
+<nobr><A HREF="android.widget.ListView.html#android.widget.ListView.setHeaderDividersEnabled_added(boolean)" class="hiddenlink" target="rightframe"><b>setHeaderDividersEnabled</b>
+(<code>boolean</code>)</A></nobr><br>
+<!-- Method setImageViewBitmap -->
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setImageViewBitmap_added(int, android.graphics.Bitmap)" class="hiddenlink" target="rightframe"><b>setImageViewBitmap</b>
+(<code>int, Bitmap</code>)</A></nobr><br>
+<!-- Method setImeActionLabel -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.setImeActionLabel_added(java.lang.CharSequence, int)" class="hiddenlink" target="rightframe"><b>setImeActionLabel</b>
+(<code>CharSequence, int</code>)</A></nobr><br>
+<!-- Method setImeOptions -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.setImeOptions_added(int)" class="hiddenlink" target="rightframe"><b>setImeOptions</b>
+(<code>int</code>)</A></nobr><br>
+<!-- Method setInexactRepeating -->
+<nobr><A HREF="android.app.AlarmManager.html#android.app.AlarmManager.setInexactRepeating_added(int, long, long, android.app.PendingIntent)" class="hiddenlink" target="rightframe"><b>setInexactRepeating</b>
+(<code>int, long, long, PendingIntent</code>)</A></nobr><br>
+<!-- Method setInputExtras -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.setInputExtras_added(int)" class="hiddenlink" target="rightframe"><b>setInputExtras</b>
+(<code>int</code>)</A></nobr><br>
+<!-- Method setInputMethodMode -->
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.setInputMethodMode_added(int)" class="hiddenlink" target="rightframe"><b>setInputMethodMode</b>
+(<code>int</code>)</A></nobr><br>
+<!-- Method setInputType -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.setInputType_added(int)" class="hiddenlink" target="rightframe"><b>setInputType</b>
+(<code>int</code>)</A></nobr><br>
+<!-- Method setInt -->
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setInt_added(int, java.lang.String, int)" class="hiddenlink" target="rightframe"><b>setInt</b>
+(<code>int, String, int</code>)</A></nobr><br>
+<!-- Method setKeyProgressIncrement -->
+<nobr><A HREF="android.widget.AbsSeekBar.html#android.widget.AbsSeekBar.setKeyProgressIncrement_added(int)" class="hiddenlink" target="rightframe"><b>setKeyProgressIncrement</b>
+(<code>int</code>)</A></nobr><br>
+<!-- Method setListSelection -->
+<nobr><A HREF="android.widget.AutoCompleteTextView.html#android.widget.AutoCompleteTextView.setListSelection_added(int)" class="hiddenlink" target="rightframe"><b>setListSelection</b>
+(<code>int</code>)</A></nobr><br>
+<!-- Method setLong -->
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setLong_added(int, java.lang.String, long)" class="hiddenlink" target="rightframe"><b>setLong</b>
+(<code>int, String, long</code>)</A></nobr><br>
+<!-- Method setMaxDuration -->
+<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.setMaxDuration_added(int)" class="hiddenlink" target="rightframe"><b>setMaxDuration</b>
+(<code>int</code>)</A></nobr><br>
+<!-- Method setMaxFileSize -->
+<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.setMaxFileSize_added(long)" class="hiddenlink" target="rightframe"><b>setMaxFileSize</b>
+(<code>long</code>)</A></nobr><br>
+<!-- Method setNetworkAvailable -->
+<nobr><A HREF="android.webkit.WebView.html#android.webkit.WebView.setNetworkAvailable_added(boolean)" class="hiddenlink" target="rightframe"><b>setNetworkAvailable</b>
+(<code>boolean</code>)</A></nobr><br>
+<!-- Method setOnChronometerTickListener -->
+<nobr><A HREF="android.widget.Chronometer.html#android.widget.Chronometer.setOnChronometerTickListener_added(android.widget.Chronometer.OnChronometerTickListener)" class="hiddenlink" target="rightframe"><b>setOnChronometerTickListener</b>
+(<code>OnChronometerTickListener</code>)</A></nobr><br>
+<!-- Method setOnClickPendingIntent -->
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setOnClickPendingIntent_added(int, android.app.PendingIntent)" class="hiddenlink" target="rightframe"><b>setOnClickPendingIntent</b>
+(<code>int, PendingIntent</code>)</A></nobr><br>
+<!-- Method setOnDoubleTapListener -->
+<nobr><A HREF="android.view.GestureDetector.html#android.view.GestureDetector.setOnDoubleTapListener_added(android.view.GestureDetector.OnDoubleTapListener)" class="hiddenlink" target="rightframe"><b>setOnDoubleTapListener</b>
+(<code>OnDoubleTapListener</code>)</A></nobr><br>
+<!-- Method setOnEditorActionListener -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.setOnEditorActionListener_added(android.widget.TextView.OnEditorActionListener)" class="hiddenlink" target="rightframe"><b>setOnEditorActionListener</b>
+(<code>OnEditorActionListener</code>)</A></nobr><br>
+<!-- Method setOnErrorListener -->
+<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.setOnErrorListener_added(android.media.MediaRecorder.OnErrorListener)" class="hiddenlink" target="rightframe"><b>setOnErrorListener</b>
+(<code>OnErrorListener</code>)</A></nobr><br>
+<!-- Method setOneShotPreviewCallback -->
+<nobr><A HREF="android.hardware.Camera.html#android.hardware.Camera.setOneShotPreviewCallback_added(android.hardware.Camera.PreviewCallback)" class="hiddenlink" target="rightframe"><b>setOneShotPreviewCallback</b>
+(<code>PreviewCallback</code>)</A></nobr><br>
+<!-- Method setOnInfoListener -->
+<i>setOnInfoListener</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.media.MediaPlayer.html#android.media.MediaPlayer.setOnInfoListener_added(android.media.MediaPlayer.OnInfoListener)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>OnInfoListener</code>)</b>&nbsp;in&nbsp;android.media.MediaPlayer
+</A></nobr><br>
+<!-- Method setOnInfoListener -->
+&nbsp;&nbsp;<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.setOnInfoListener_added(android.media.MediaRecorder.OnInfoListener)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>OnInfoListener</code>)</b>&nbsp;in&nbsp;android.media.MediaRecorder
+</A></nobr><br>
+<!-- Method setOnVideoSizeChangedListener -->
+<nobr><A HREF="android.media.MediaPlayer.html#android.media.MediaPlayer.setOnVideoSizeChangedListener_added(android.media.MediaPlayer.OnVideoSizeChangedListener)" class="hiddenlink" target="rightframe"><b>setOnVideoSizeChangedListener</b>
+(<code>OnVideoSizeChangedListener</code>)</A></nobr><br>
+<!-- Method setOutputFile -->
+<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.setOutputFile_added(java.io.FileDescriptor)" class="hiddenlink" target="rightframe"><b>setOutputFile</b>
+(<code>FileDescriptor</code>)</A></nobr><br>
+<!-- Method setOutsideTouchable -->
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.setOutsideTouchable_added(boolean)" class="hiddenlink" target="rightframe"><b>setOutsideTouchable</b>
+(<code>boolean</code>)</A></nobr><br>
+<!-- Method setPreviewDisplay -->
+<nobr><A HREF="android.hardware.Camera.html#android.hardware.Camera.setPreviewDisplay_changed(android.view.SurfaceHolder)" class="hiddenlink" target="rightframe">setPreviewDisplay
+(<code>SurfaceHolder</code>)</A></nobr><br>
+<!-- Method setPrivateImeOptions -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.setPrivateImeOptions_added(java.lang.String)" class="hiddenlink" target="rightframe"><b>setPrivateImeOptions</b>
+(<code>String</code>)</A></nobr><br>
+<!-- Method setRawInputType -->
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.setRawInputType_added(int)" class="hiddenlink" target="rightframe"><b>setRawInputType</b>
+(<code>int</code>)</A></nobr><br>
+<!-- Method setScrollContainer -->
+<nobr><A HREF="android.view.View.html#android.view.View.setScrollContainer_added(boolean)" class="hiddenlink" target="rightframe"><b>setScrollContainer</b>
+(<code>boolean</code>)</A></nobr><br>
+<!-- Method setShort -->
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setShort_added(int, java.lang.String, short)" class="hiddenlink" target="rightframe"><b>setShort</b>
+(<code>int, String, short</code>)</A></nobr><br>
+<!-- Method setSmoothScrollbarEnabled -->
+<nobr><A HREF="android.widget.AbsListView.html#android.widget.AbsListView.setSmoothScrollbarEnabled_added(boolean)" class="hiddenlink" target="rightframe"><b>setSmoothScrollbarEnabled</b>
+(<code>boolean</code>)</A></nobr><br>
+<!-- Method setSoftInputMode -->
+<nobr><A HREF="android.view.Window.html#android.view.Window.setSoftInputMode_added(int)" class="hiddenlink" target="rightframe"><b>setSoftInputMode</b>
+(<code>int</code>)</A></nobr><br>
+<!-- Method setStaticTransformationsEnabled -->
+<nobr><A HREF="android.view.ViewGroup.html#android.view.ViewGroup.setStaticTransformationsEnabled_added(boolean)" class="hiddenlink" target="rightframe"><b>setStaticTransformationsEnabled</b>
+(<code>boolean</code>)</A></nobr><br>
+<!-- Method setString -->
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setString_added(int, java.lang.String, java.lang.String)" class="hiddenlink" target="rightframe"><b>setString</b>
+(<code>int, String, String</code>)</A></nobr><br>
+<!-- Method setTestProviderEnabled -->
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.setTestProviderEnabled_added(java.lang.String, boolean)" class="hiddenlink" target="rightframe"><b>setTestProviderEnabled</b>
+(<code>String, boolean</code>)</A></nobr><br>
+<!-- Method setTestProviderLocation -->
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.setTestProviderLocation_added(java.lang.String, android.location.Location)" class="hiddenlink" target="rightframe"><b>setTestProviderLocation</b>
+(<code>String, Location</code>)</A></nobr><br>
+<!-- Method setTestProviderStatus -->
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.setTestProviderStatus_added(java.lang.String, int, android.os.Bundle, long)" class="hiddenlink" target="rightframe"><b>setTestProviderStatus</b>
+(<code>String, int, Bundle, long</code>)</A></nobr><br>
+<!-- Method setTextColor -->
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setTextColor_added(int, int)" class="hiddenlink" target="rightframe"><b>setTextColor</b>
+(<code>int, int</code>)</A></nobr><br>
+<!-- Class Settings -->
+<A HREF="android.provider.Settings.html" class="hiddenlink" target="rightframe">Settings</A><br>
+<!-- Class Settings.Secure -->
+<A HREF="pkg_android.provider.html#Settings.Secure" class="hiddenlink" target="rightframe"><b>Settings.Secure</b></A><br>
+<!-- Class Settings.System -->
+<A HREF="android.provider.Settings.System.html" class="hiddenlink" target="rightframe">Settings.System</A><br>
+<!-- Field SETTINGS_CLASSNAME -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.SETTINGS_CLASSNAME" class="hiddenlink" target="rightframe">SETTINGS_CLASSNAME</A>
+</nobr><br>
+<!-- Field settingsActivity -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.settingsActivity" class="hiddenlink" target="rightframe">settingsActivity</A>
+</nobr><br>
+<!-- Method setTouchable -->
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.setTouchable_added(boolean)" class="hiddenlink" target="rightframe"><b>setTouchable</b>
+(<code>boolean</code>)</A></nobr><br>
+<!-- Method setTouchInterceptor -->
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.setTouchInterceptor_added(android.view.View.OnTouchListener)" class="hiddenlink" target="rightframe"><b>setTouchInterceptor</b>
+(<code>OnTouchListener</code>)</A></nobr><br>
+<!-- Method setUri -->
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setUri_added(int, java.lang.String, android.net.Uri)" class="hiddenlink" target="rightframe"><b>setUri</b>
+(<code>int, String, Uri</code>)</A></nobr><br>
+<!-- Method setUserAgent -->
+<nobr><A HREF="android.webkit.WebSettings.html#android.webkit.WebSettings.setUserAgent_changed(int)" class="hiddenlink" target="rightframe">setUserAgent
+(<code>int</code>)</A></nobr><br>
+<!-- Method setUserAgentString -->
+<nobr><A HREF="android.webkit.WebSettings.html#android.webkit.WebSettings.setUserAgentString_added(java.lang.String)" class="hiddenlink" target="rightframe"><b>setUserAgentString</b>
+(<code>String</code>)</A></nobr><br>
+<!-- Method setVideoEncoder -->
+<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.setVideoEncoder_added(int)" class="hiddenlink" target="rightframe"><b>setVideoEncoder</b>
+(<code>int</code>)</A></nobr><br>
+<!-- Method setVideoFrameRate -->
+<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.setVideoFrameRate_added(int)" class="hiddenlink" target="rightframe"><b>setVideoFrameRate</b>
+(<code>int</code>)</A></nobr><br>
+<!-- Method setVideoSize -->
+<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.setVideoSize_added(int, int)" class="hiddenlink" target="rightframe"><b>setVideoSize</b>
+(<code>int, int</code>)</A></nobr><br>
+<!-- Method setVideoSource -->
+<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.setVideoSource_added(int)" class="hiddenlink" target="rightframe"><b>setVideoSource</b>
+(<code>int</code>)</A></nobr><br>
+<!-- Method setView -->
+<nobr><A HREF="android.app.AlertDialog.html#android.app.AlertDialog.setView_added(android.view.View, int, int, int, int)" class="hiddenlink" target="rightframe"><b>setView</b>
+(<code>View, int, int, int, int</code>)</A></nobr><br>
+<!-- Method setViewResource -->
+<nobr><A HREF="android.widget.ResourceCursorAdapter.html#android.widget.ResourceCursorAdapter.setViewResource_added(int)" class="hiddenlink" target="rightframe"><b>setViewResource</b>
+(<code>int</code>)</A></nobr><br>
+<!-- Method setVisible -->
+<nobr><A HREF="android.app.Activity.html#android.app.Activity.setVisible_added(boolean)" class="hiddenlink" target="rightframe"><b>setVisible</b>
+(<code>boolean</code>)</A></nobr><br>
+<!-- Method setWindowAnimations -->
+<nobr><A HREF="android.view.Window.html#android.view.Window.setWindowAnimations_added(int)" class="hiddenlink" target="rightframe"><b>setWindowAnimations</b>
+(<code>int</code>)</A></nobr><br>
+<!-- Method setWindowLayoutMode -->
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.setWindowLayoutMode_added(int, int)" class="hiddenlink" target="rightframe"><b>setWindowLayoutMode</b>
+(<code>int, int</code>)</A></nobr><br>
+<!-- Class Shape -->
+<A HREF="android.graphics.drawable.shapes.Shape.html" class="hiddenlink" target="rightframe">Shape</A><br>
+<!-- Field sharedUserId -->
+<nobr><A HREF="android.content.pm.PackageInfo.html#android.content.pm.PackageInfo.sharedUserId" class="hiddenlink" target="rightframe">sharedUserId</A>
+</nobr><br>
+<!-- Field sharedUserLabel -->
+<i>sharedUserLabel</i><br>
+&nbsp;in&nbsp;
+<nobr><A HREF="android.R.attr.html#android.R.attr.sharedUserLabel" class="hiddenlink" target="rightframe">android.R.attr</A>
+</nobr><br>
+<!-- Field sharedUserLabel -->
+&nbsp;in&nbsp;
+<nobr><A HREF="android.content.pm.PackageInfo.html#android.content.pm.PackageInfo.sharedUserLabel" class="hiddenlink" target="rightframe">android.content.pm.PackageInfo</A>
+</nobr><br>
+<!-- Field SHOW_OR_CREATE_CONTACT -->
+<nobr><A HREF="android.provider.Contacts.Intents.html#android.provider.Contacts.Intents.SHOW_OR_CREATE_CONTACT" class="hiddenlink" target="rightframe">SHOW_OR_CREATE_CONTACT</A>
+</nobr><br>
+<!-- Class SimpleCursorAdapter -->
+<A HREF="android.widget.SimpleCursorAdapter.html" class="hiddenlink" target="rightframe">SimpleCursorAdapter</A><br>
+<!-- Field singleLine -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.singleLine" class="hiddenlink" target="rightframe">singleLine</A>
+</nobr><br>
+<!-- Class SlidingDrawer -->
+<A HREF="pkg_android.widget.html#SlidingDrawer" class="hiddenlink" target="rightframe"><b>SlidingDrawer</b></A><br>
+<!-- Class SlidingDrawer.OnDrawerCloseListener -->
+<A HREF="pkg_android.widget.html#SlidingDrawer.OnDrawerCloseListener" class="hiddenlink" target="rightframe"><b><i>SlidingDrawer.OnDrawerCloseListener</i></b></A><br>
+<!-- Class SlidingDrawer.OnDrawerOpenListener -->
+<A HREF="pkg_android.widget.html#SlidingDrawer.OnDrawerOpenListener" class="hiddenlink" target="rightframe"><b><i>SlidingDrawer.OnDrawerOpenListener</i></b></A><br>
+<!-- Class SlidingDrawer.OnDrawerScrollListener -->
+<A HREF="pkg_android.widget.html#SlidingDrawer.OnDrawerScrollListener" class="hiddenlink" target="rightframe"><b><i>SlidingDrawer.OnDrawerScrollListener</i></b></A><br>
+<!-- Field smoothScrollbar -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.smoothScrollbar" class="hiddenlink" target="rightframe">smoothScrollbar</A>
+</nobr><br>
+<!-- Class SmsMessage -->
+<A HREF="android.telephony.gsm.SmsMessage.html" class="hiddenlink" target="rightframe">SmsMessage</A><br>
+<!-- Class Socket -->
+<i>Socket</i><br>
+&nbsp;&nbsp;<A HREF="java.net.Socket.html" class="hiddenlink" target="rightframe">java.net</A><br>
+<!-- Constructor Socket -->
+&nbsp;&nbsp;<nobr><A HREF="java.net.Socket.html#java.net.Socket.ctor_changed()" class="hiddenlink" target="rightframe">Socket
+()</A></nobr>&nbsp;constructor<br>
+<!-- Constructor Socket -->
+&nbsp;&nbsp;<nobr><A HREF="java.net.Socket.html#java.net.Socket.ctor_changed(java.lang.String, int)" class="hiddenlink" target="rightframe">Socket
+(<code>String, int</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Constructor Socket -->
+&nbsp;&nbsp;<nobr><A HREF="java.net.Socket.html#java.net.Socket.ctor_changed(java.lang.String, int, java.net.InetAddress, int)" class="hiddenlink" target="rightframe">Socket
+(<code>String, int, InetAddress, int</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Constructor Socket -->
+&nbsp;&nbsp;<nobr><A HREF="java.net.Socket.html#java.net.Socket.ctor_changed(java.net.Proxy)" class="hiddenlink" target="rightframe">Socket
+(<code>Proxy</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Constructor Socket -->
+&nbsp;&nbsp;<nobr><A HREF="java.net.Socket.html#java.net.Socket.ctor_changed(java.net.SocketImpl)" class="hiddenlink" target="rightframe">Socket
+(<code>SocketImpl</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Field SOFT_INPUT_ADJUST_PAN -->
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN" class="hiddenlink" target="rightframe">SOFT_INPUT_ADJUST_PAN</A>
+</nobr><br>
+<!-- Field SOFT_INPUT_ADJUST_RESIZE -->
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE" class="hiddenlink" target="rightframe">SOFT_INPUT_ADJUST_RESIZE</A>
+</nobr><br>
+<!-- Field SOFT_INPUT_ADJUST_UNSPECIFIED -->
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SOFT_INPUT_ADJUST_UNSPECIFIED" class="hiddenlink" target="rightframe">SOFT_INPUT_ADJUST_UNSPECIFIED</A>
+</nobr><br>
+<!-- Field SOFT_INPUT_IS_FORWARD_NAVIGATION -->
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SOFT_INPUT_IS_FORWARD_NAVIGATION" class="hiddenlink" target="rightframe">SOFT_INPUT_IS_FORWARD_NAVIGATION</A>
+</nobr><br>
+<!-- Field SOFT_INPUT_MASK_ADJUST -->
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SOFT_INPUT_MASK_ADJUST" class="hiddenlink" target="rightframe">SOFT_INPUT_MASK_ADJUST</A>
+</nobr><br>
+<!-- Field SOFT_INPUT_MASK_STATE -->
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SOFT_INPUT_MASK_STATE" class="hiddenlink" target="rightframe">SOFT_INPUT_MASK_STATE</A>
+</nobr><br>
+<!-- Field SOFT_INPUT_MODE_CHANGED -->
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SOFT_INPUT_MODE_CHANGED" class="hiddenlink" target="rightframe">SOFT_INPUT_MODE_CHANGED</A>
+</nobr><br>
+<!-- Field SOFT_INPUT_STATE_ALWAYS_HIDDEN -->
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN" class="hiddenlink" target="rightframe">SOFT_INPUT_STATE_ALWAYS_HIDDEN</A>
+</nobr><br>
+<!-- Field SOFT_INPUT_STATE_ALWAYS_VISIBLE -->
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE" class="hiddenlink" target="rightframe">SOFT_INPUT_STATE_ALWAYS_VISIBLE</A>
+</nobr><br>
+<!-- Field SOFT_INPUT_STATE_HIDDEN -->
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN" class="hiddenlink" target="rightframe">SOFT_INPUT_STATE_HIDDEN</A>
+</nobr><br>
+<!-- Field SOFT_INPUT_STATE_UNCHANGED -->
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_UNCHANGED" class="hiddenlink" target="rightframe">SOFT_INPUT_STATE_UNCHANGED</A>
+</nobr><br>
+<!-- Field SOFT_INPUT_STATE_UNSPECIFIED -->
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_UNSPECIFIED" class="hiddenlink" target="rightframe">SOFT_INPUT_STATE_UNSPECIFIED</A>
+</nobr><br>
+<!-- Field SOFT_INPUT_STATE_VISIBLE -->
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE" class="hiddenlink" target="rightframe">SOFT_INPUT_STATE_VISIBLE</A>
+</nobr><br>
+<!-- Field softInputMode -->
+<i>softInputMode</i><br>
+&nbsp;in&nbsp;
+<nobr><A HREF="android.content.pm.ActivityInfo.html#android.content.pm.ActivityInfo.softInputMode" class="hiddenlink" target="rightframe">android.content.pm.ActivityInfo</A>
+</nobr><br>
+<!-- Field softInputMode -->
+&nbsp;in&nbsp;
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.softInputMode" class="hiddenlink" target="rightframe">android.view.WindowManager.LayoutParams</A>
+</nobr><br>
+<!-- Method sort -->
+<nobr><A HREF="android.widget.ArrayAdapter.html#android.widget.ArrayAdapter.sort_added(java.util.Comparator<? super T>)" class="hiddenlink" target="rightframe"><b>sort</b>
+(<code>Comparator&lt;? super T&gt;</code>)</A></nobr><br>
+<!-- Class SoundPool -->
+<A HREF="android.media.SoundPool.html" class="hiddenlink" target="rightframe">SoundPool</A><br>
+<!-- Field SPAN_COMPOSING -->
+<nobr><A HREF="android.text.Spanned.html#android.text.Spanned.SPAN_COMPOSING" class="hiddenlink" target="rightframe">SPAN_COMPOSING</A>
+</nobr><br>
+<!-- Field SPAN_INTERMEDIATE -->
+<nobr><A HREF="android.text.Spanned.html#android.text.Spanned.SPAN_INTERMEDIATE" class="hiddenlink" target="rightframe">SPAN_INTERMEDIATE</A>
+</nobr><br>
+<!-- Field SPAN_POINT_MARK_MASK -->
+<nobr><A HREF="android.text.Spanned.html#android.text.Spanned.SPAN_POINT_MARK_MASK" class="hiddenlink" target="rightframe">SPAN_POINT_MARK_MASK</A>
+</nobr><br>
+<!-- Class Spanned -->
+<A HREF="android.text.Spanned.html" class="hiddenlink" target="rightframe"><i>Spanned</i></A><br>
+<!-- Class SpanWatcher -->
+<A HREF="android.text.SpanWatcher.html" class="hiddenlink" target="rightframe"><i>SpanWatcher</i></A><br>
+<!-- Class SparseIntArray -->
+<A HREF="android.util.SparseIntArray.html" class="hiddenlink" target="rightframe">SparseIntArray</A><br>
+<!-- Class SQLiteDatabase -->
+<A HREF="android.database.sqlite.SQLiteDatabase.html" class="hiddenlink" target="rightframe">SQLiteDatabase</A><br>
+<!-- Field startSelectingText -->
+<nobr><A HREF="android.R.id.html#android.R.id.startSelectingText" class="hiddenlink" target="rightframe">startSelectingText</A>
+</nobr><br>
+<!-- Field state_long_pressable -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.state_long_pressable" class="hiddenlink" target="rightframe">state_long_pressable</A>
+</nobr><br>
+<!-- Field stopSelectingText -->
+<nobr><A HREF="android.R.id.html#android.R.id.stopSelectingText" class="hiddenlink" target="rightframe">stopSelectingText</A>
+</nobr><br>
+<!-- Field STREAM_NOTIFICATION -->
+<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.STREAM_NOTIFICATION" class="hiddenlink" target="rightframe">STREAM_NOTIFICATION</A>
+</nobr><br>
+<!-- Field STRETCH_SPACING_UNIFORM -->
+<nobr><A HREF="android.widget.GridView.html#android.widget.GridView.STRETCH_SPACING_UNIFORM" class="hiddenlink" target="rightframe">STRETCH_SPACING_UNIFORM</A>
+</nobr><br>
+<!-- Class StrikethroughSpan -->
+<i>StrikethroughSpan</i><br>
+&nbsp;&nbsp;<A HREF="android.text.style.StrikethroughSpan.html" class="hiddenlink" target="rightframe">android.text.style</A><br>
+<!-- Constructor StrikethroughSpan -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.StrikethroughSpan.html#android.text.style.StrikethroughSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>StrikethroughSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Class String -->
+<i>String</i><br>
+&nbsp;&nbsp;<A HREF="java.lang.String.html" class="hiddenlink" target="rightframe">java.lang</A><br>
+<!-- Constructor String -->
+&nbsp;&nbsp;<nobr><A HREF="java.lang.String.html#java.lang.String.ctor_changed()" class="hiddenlink" target="rightframe">String
+()</A></nobr>&nbsp;constructor<br>
+<!-- Constructor String -->
+&nbsp;&nbsp;<nobr><A HREF="java.lang.String.html#java.lang.String.ctor_changed(byte[])" class="hiddenlink" target="rightframe">String
+(<code>byte[]</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Constructor String -->
+&nbsp;&nbsp;<nobr><A HREF="java.lang.String.html#java.lang.String.ctor_changed(byte[], int)" class="hiddenlink" target="rightframe">String
+(<code>byte[], int</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Constructor String -->
+&nbsp;&nbsp;<nobr><A HREF="java.lang.String.html#java.lang.String.ctor_changed(byte[], int, int)" class="hiddenlink" target="rightframe">String
+(<code>byte[], int, int</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Constructor String -->
+&nbsp;&nbsp;<nobr><A HREF="java.lang.String.html#java.lang.String.ctor_changed(byte[], int, int, int)" class="hiddenlink" target="rightframe">String
+(<code>byte[], int, int, int</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Class StyleSpan -->
+<i>StyleSpan</i><br>
+&nbsp;&nbsp;<A HREF="android.text.style.StyleSpan.html" class="hiddenlink" target="rightframe">android.text.style</A><br>
+<!-- Constructor StyleSpan -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.StyleSpan.html#android.text.style.StyleSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>StyleSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Class SubscriptSpan -->
+<i>SubscriptSpan</i><br>
+&nbsp;&nbsp;<A HREF="android.text.style.SubscriptSpan.html" class="hiddenlink" target="rightframe">android.text.style</A><br>
+<!-- Constructor SubscriptSpan -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.SubscriptSpan.html#android.text.style.SubscriptSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>SubscriptSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Class SuperscriptSpan -->
+<i>SuperscriptSpan</i><br>
+&nbsp;&nbsp;<A HREF="android.text.style.SuperscriptSpan.html" class="hiddenlink" target="rightframe">android.text.style</A><br>
+<!-- Constructor SuperscriptSpan -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.SuperscriptSpan.html#android.text.style.SuperscriptSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>SuperscriptSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Field switchInputMethod -->
+<nobr><A HREF="android.R.id.html#android.R.id.switchInputMethod" class="hiddenlink" target="rightframe">switchInputMethod</A>
+</nobr><br>
+<!-- Class TelephonyManager -->
+<A NAME="T"></A>
+<br><font size="+2">T</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.telephony.TelephonyManager.html" class="hiddenlink" target="rightframe">TelephonyManager</A><br>
+<!-- Field TERTIARY_EMAIL -->
+<nobr><A HREF="android.provider.Contacts.Intents.Insert.html#android.provider.Contacts.Intents.Insert.TERTIARY_EMAIL" class="hiddenlink" target="rightframe">TERTIARY_EMAIL</A>
+</nobr><br>
+<!-- Field TERTIARY_EMAIL_TYPE -->
+<nobr><A HREF="android.provider.Contacts.Intents.Insert.html#android.provider.Contacts.Intents.Insert.TERTIARY_EMAIL_TYPE" class="hiddenlink" target="rightframe">TERTIARY_EMAIL_TYPE</A>
+</nobr><br>
+<!-- Field TERTIARY_PHONE -->
+<nobr><A HREF="android.provider.Contacts.Intents.Insert.html#android.provider.Contacts.Intents.Insert.TERTIARY_PHONE" class="hiddenlink" target="rightframe">TERTIARY_PHONE</A>
+</nobr><br>
+<!-- Field TERTIARY_PHONE_TYPE -->
+<nobr><A HREF="android.provider.Contacts.Intents.Insert.html#android.provider.Contacts.Intents.Insert.TERTIARY_PHONE_TYPE" class="hiddenlink" target="rightframe">TERTIARY_PHONE_TYPE</A>
+</nobr><br>
+<!-- Class TestMethod -->
+<i>TestMethod</i><br>
+&nbsp;&nbsp;<A HREF="android.test.suitebuilder.TestMethod.html" class="hiddenlink" target="rightframe">android.test.suitebuilder</A><br>
+<!-- Constructor TestMethod -->
+&nbsp;&nbsp;<nobr><A HREF="android.test.suitebuilder.TestMethod.html#android.test.suitebuilder.TestMethod.ctor_added(java.lang.String, java.lang.Class<? extends junit.framework.TestCase>)" class="hiddenlink" target="rightframe"><b>TestMethod</b>
+(<code>String, Class&lt;TestCase&gt;</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Constructor TestMethod -->
+&nbsp;&nbsp;<nobr><A HREF="android.test.suitebuilder.TestMethod.html#android.test.suitebuilder.TestMethod.ctor_added(junit.framework.TestCase)" class="hiddenlink" target="rightframe"><b>TestMethod</b>
+(<code>TestCase</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Class TestSuiteBuilder -->
+<A HREF="android.test.suitebuilder.TestSuiteBuilder.html" class="hiddenlink" target="rightframe">TestSuiteBuilder</A><br>
+<!-- Class TextAppearanceSpan -->
+<i>TextAppearanceSpan</i><br>
+&nbsp;&nbsp;<A HREF="android.text.style.TextAppearanceSpan.html" class="hiddenlink" target="rightframe">android.text.style</A><br>
+<!-- Constructor TextAppearanceSpan -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.TextAppearanceSpan.html#android.text.style.TextAppearanceSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>TextAppearanceSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Class TextKeyListener -->
+<A HREF="android.text.method.TextKeyListener.html" class="hiddenlink" target="rightframe">TextKeyListener</A><br>
+<!-- Class TextUtils -->
+<A HREF="android.text.TextUtils.html" class="hiddenlink" target="rightframe">TextUtils</A><br>
+<!-- Class TextView -->
+<A HREF="android.widget.TextView.html" class="hiddenlink" target="rightframe">TextView</A><br>
+<!-- Class TextView.OnEditorActionListener -->
+<A HREF="pkg_android.widget.html#TextView.OnEditorActionListener" class="hiddenlink" target="rightframe"><b><i>TextView.OnEditorActionListener</i></b></A><br>
+<!-- Class TextWatcher -->
+<A HREF="android.text.TextWatcher.html" class="hiddenlink" target="rightframe"><i>TextWatcher</i></A><br>
+<!-- Field Theme_InputMethod -->
+<nobr><A HREF="android.R.style.html#android.R.style.Theme_InputMethod" class="hiddenlink" target="rightframe">Theme_InputMethod</A>
+</nobr><br>
+<!-- Field Theme_Light_Panel -->
+<nobr><A HREF="android.R.style.html#android.R.style.Theme_Light_Panel" class="hiddenlink" target="rightframe">Theme_Light_Panel</A>
+</nobr><br>
+<!-- Field Theme_NoDisplay -->
+<nobr><A HREF="android.R.style.html#android.R.style.Theme_NoDisplay" class="hiddenlink" target="rightframe">Theme_NoDisplay</A>
+</nobr><br>
+<!-- Field Theme_Panel -->
+<nobr><A HREF="android.R.style.html#android.R.style.Theme_Panel" class="hiddenlink" target="rightframe">Theme_Panel</A>
+</nobr><br>
+<!-- Field thickness -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.thickness" class="hiddenlink" target="rightframe">thickness</A>
+</nobr><br>
+<!-- Class TimeKeyListener -->
+<A HREF="android.text.method.TimeKeyListener.html" class="hiddenlink" target="rightframe">TimeKeyListener</A><br>
+<!-- Class TimeUtils -->
+<A HREF="android.util.TimeUtils.html" class="hiddenlink" target="rightframe">TimeUtils</A><br>
+<!-- Field title_bar_tall -->
+<nobr><A HREF="android.R.drawable.html#android.R.drawable.title_bar_tall" class="hiddenlink" target="rightframe">title_bar_tall</A>
+</nobr><br>
+<!-- Field topOffset -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.topOffset" class="hiddenlink" target="rightframe">topOffset</A>
+</nobr><br>
+<!-- Method toShortString -->
+<i>toShortString</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.graphics.Rect.html#android.graphics.Rect.toShortString_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.graphics.Rect
+</A></nobr><br>
+<!-- Method toShortString -->
+&nbsp;&nbsp;<nobr><A HREF="android.view.animation.Transformation.html#android.view.animation.Transformation.toShortString_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.view.animation.Transformation
+</A></nobr><br>
+<!-- Class Touch -->
+<A HREF="android.text.method.Touch.html" class="hiddenlink" target="rightframe">Touch</A><br>
+<!-- Class TouchUtils -->
+<A HREF="android.test.TouchUtils.html" class="hiddenlink" target="rightframe">TouchUtils</A><br>
+<!-- Class Transformation -->
+<A HREF="android.view.animation.Transformation.html" class="hiddenlink" target="rightframe">Transformation</A><br>
+<!-- Class TransitionDrawable -->
+<i>TransitionDrawable</i><br>
+&nbsp;&nbsp;<A HREF="android.graphics.drawable.TransitionDrawable.html" class="hiddenlink" target="rightframe">android.graphics.drawable</A><br>
+<!-- Constructor TransitionDrawable -->
+&nbsp;&nbsp;<nobr><A HREF="android.graphics.drawable.TransitionDrawable.html#android.graphics.drawable.TransitionDrawable.ctor_added(android.graphics.drawable.Drawable[])" class="hiddenlink" target="rightframe"><b>TransitionDrawable</b>
+(<code>Drawable[]</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Field TYPE_APPLICATION_ATTACHED_DIALOG -->
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.TYPE_APPLICATION_ATTACHED_DIALOG" class="hiddenlink" target="rightframe">TYPE_APPLICATION_ATTACHED_DIALOG</A>
+</nobr><br>
+<!-- Field TYPE_INPUT_METHOD -->
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD" class="hiddenlink" target="rightframe">TYPE_INPUT_METHOD</A>
+</nobr><br>
+<!-- Field TYPE_INPUT_METHOD_DIALOG -->
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD_DIALOG" class="hiddenlink" target="rightframe">TYPE_INPUT_METHOD_DIALOG</A>
+</nobr><br>
+<!-- Class TypedArray -->
+<A HREF="android.content.res.TypedArray.html" class="hiddenlink" target="rightframe">TypedArray</A><br>
+<!-- Class TypefaceSpan -->
+<i>TypefaceSpan</i><br>
+&nbsp;&nbsp;<A HREF="android.text.style.TypefaceSpan.html" class="hiddenlink" target="rightframe">android.text.style</A><br>
+<!-- Constructor TypefaceSpan -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.TypefaceSpan.html#android.text.style.TypefaceSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>TypefaceSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Class UnderlineSpan -->
+<A NAME="U"></A>
+<br><font size="+2">U</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<i>UnderlineSpan</i><br>
+&nbsp;&nbsp;<A HREF="android.text.style.UnderlineSpan.html" class="hiddenlink" target="rightframe">android.text.style</A><br>
+<!-- Constructor UnderlineSpan -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.UnderlineSpan.html#android.text.style.UnderlineSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>UnderlineSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Field UNKNOWN_LENGTH -->
+<nobr><A HREF="android.content.res.AssetFileDescriptor.html#android.content.res.AssetFileDescriptor.UNKNOWN_LENGTH" class="hiddenlink" target="rightframe">UNKNOWN_LENGTH</A>
+</nobr><br>
+<!-- Method unregisterListener -->
+<i>unregisterListener</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.unregisterListener_added(android.hardware.SensorEventListener)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>SensorEventListener</code>)</b>&nbsp;in&nbsp;android.hardware.SensorManager
+</A></nobr><br>
+<!-- Method unregisterListener -->
+&nbsp;&nbsp;<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.unregisterListener_added(android.hardware.SensorEventListener, android.hardware.Sensor)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>SensorEventListener, Sensor</code>)</b>&nbsp;in&nbsp;android.hardware.SensorManager
+</A></nobr><br>
+<!-- Method unregisterListener -->
+&nbsp;&nbsp;<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.unregisterListener_changed(android.hardware.SensorListener)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>SensorListener</code>)&nbsp;in&nbsp;android.hardware.SensorManager
+</A></nobr><br>
+<!-- Method unregisterListener -->
+&nbsp;&nbsp;<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.unregisterListener_changed(android.hardware.SensorListener, int)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>SensorListener, int</code>)&nbsp;in&nbsp;android.hardware.SensorManager
+</A></nobr><br>
+<!-- Method update -->
+<i>update</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.update_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.widget.PopupWindow
+</A></nobr><br>
+<!-- Method update -->
+&nbsp;&nbsp;<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.update_added(int, int, int, int, boolean)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>int, int, int, int, boolean</code>)</b>&nbsp;in&nbsp;android.widget.PopupWindow
+</A></nobr><br>
+<!-- Field UPDATE_DEVICE_STATS -->
+<nobr><A HREF="android.Manifest.permission.html#android.Manifest.permission.UPDATE_DEVICE_STATS" class="hiddenlink" target="rightframe">UPDATE_DEVICE_STATS</A>
+</nobr><br>
+<!-- Class UpdateAppearance -->
+<A HREF="pkg_android.text.style.html#UpdateAppearance" class="hiddenlink" target="rightframe"><b><i>UpdateAppearance</i></b></A><br>
+<!-- Class UpdateLayout -->
+<A HREF="android.text.style.UpdateLayout.html" class="hiddenlink" target="rightframe"><i>UpdateLayout</i></A><br>
+<!-- Field updatePeriodMillis -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.updatePeriodMillis" class="hiddenlink" target="rightframe">updatePeriodMillis</A>
+</nobr><br>
+<!-- Class UrlInterceptHandler -->
+<A HREF="android.webkit.UrlInterceptHandler.html" class="hiddenlink" target="rightframe"><i>UrlInterceptHandler</i></A><br>
+<!-- Class UrlInterceptRegistry -->
+<A HREF="android.webkit.UrlInterceptRegistry.html" class="hiddenlink" target="rightframe">UrlInterceptRegistry</A><br>
+<!-- Class URLSpan -->
+<i>URLSpan</i><br>
+&nbsp;&nbsp;<A HREF="android.text.style.URLSpan.html" class="hiddenlink" target="rightframe">android.text.style</A><br>
+<!-- Constructor URLSpan -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.URLSpan.html#android.text.style.URLSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>URLSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Class URLUtil -->
+<A HREF="android.webkit.URLUtil.html" class="hiddenlink" target="rightframe">URLUtil</A><br>
+<!-- Field USB_MASS_STORAGE_ENABLED -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.USB_MASS_STORAGE_ENABLED" class="hiddenlink" target="rightframe">USB_MASS_STORAGE_ENABLED</A>
+</nobr><br>
+<!-- Field USE_GOOGLE_MAIL -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.USE_GOOGLE_MAIL" class="hiddenlink" target="rightframe">USE_GOOGLE_MAIL</A>
+</nobr><br>
+<!-- Class UserDictionary -->
+<A HREF="pkg_android.provider.html#UserDictionary" class="hiddenlink" target="rightframe"><b>UserDictionary</b></A><br>
+<!-- Class UserDictionary.Words -->
+<A HREF="pkg_android.provider.html#UserDictionary.Words" class="hiddenlink" target="rightframe"><b>UserDictionary.Words</b></A><br>
+<!-- Field verticalCorrection -->
+<A NAME="V"></A>
+<br><font size="+2">V</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.R.attr.html#android.R.attr.verticalCorrection" class="hiddenlink" target="rightframe">verticalCorrection</A>
+</nobr><br>
+<!-- Field verticalGap -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.verticalGap" class="hiddenlink" target="rightframe">verticalGap</A>
+</nobr><br>
+<!-- Field VideoView_error_text_invalid_progressive_playback -->
+<nobr><A HREF="android.R.string.html#android.R.string.VideoView_error_text_invalid_progressive_playback" class="hiddenlink" target="rightframe">VideoView_error_text_invalid_progressive_playback</A>
+</nobr><br>
+<!-- Class View -->
+<A HREF="android.view.View.html" class="hiddenlink" target="rightframe">View</A><br>
+<!-- Class ViewConfiguration -->
+<i>ViewConfiguration</i><br>
+&nbsp;&nbsp;<A HREF="android.view.ViewConfiguration.html" class="hiddenlink" target="rightframe">android.view</A><br>
+<!-- Constructor ViewConfiguration -->
+&nbsp;&nbsp;<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.ctor_changed()" class="hiddenlink" target="rightframe">ViewConfiguration
+()</A></nobr>&nbsp;constructor<br>
+<!-- Class ViewDebug -->
+<A HREF="android.view.ViewDebug.html" class="hiddenlink" target="rightframe">ViewDebug</A><br>
+<!-- Class ViewDebug.CapturedViewProperty -->
+<A HREF="pkg_android.view.html#ViewDebug.CapturedViewProperty" class="hiddenlink" target="rightframe"><b>ViewDebug.CapturedViewProperty</b></A><br>
+<!-- Class ViewGroup -->
+<A HREF="android.view.ViewGroup.html" class="hiddenlink" target="rightframe">ViewGroup</A><br>
+<!-- Class ViewParent -->
+<A HREF="android.view.ViewParent.html" class="hiddenlink" target="rightframe"><i>ViewParent</i></A><br>
+<!-- Class ViewTreeObserver -->
+<A HREF="android.view.ViewTreeObserver.html" class="hiddenlink" target="rightframe">ViewTreeObserver</A><br>
+<!-- Class ViewTreeObserver.OnScrollChangedListener -->
+<A HREF="pkg_android.view.html#ViewTreeObserver.OnScrollChangedListener" class="hiddenlink" target="rightframe"><b><i>ViewTreeObserver.OnScrollChangedListener</i></b></A><br>
+<!-- Class Visibility -->
+<A HREF="pkg_android.opengl.html#Visibility" class="hiddenlink" target="rightframe"><b>Visibility</b></A><br>
+<!-- Class VMDebug -->
+<A HREF="dalvik.system.VMDebug.html" class="hiddenlink" target="rightframe">VMDebug</A><br>
+<!-- Field voiceLanguage -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.voiceLanguage" class="hiddenlink" target="rightframe">voiceLanguage</A>
+</nobr><br>
+<!-- Field voiceLanguageModel -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.voiceLanguageModel" class="hiddenlink" target="rightframe">voiceLanguageModel</A>
+</nobr><br>
+<!-- Field voiceMaxResults -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.voiceMaxResults" class="hiddenlink" target="rightframe">voiceMaxResults</A>
+</nobr><br>
+<!-- Field voicePromptText -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.voicePromptText" class="hiddenlink" target="rightframe">voicePromptText</A>
+</nobr><br>
+<!-- Field voiceSearchMode -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.voiceSearchMode" class="hiddenlink" target="rightframe">voiceSearchMode</A>
+</nobr><br>
+<!-- Field VOLUME_NOTIFICATION -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.VOLUME_NOTIFICATION" class="hiddenlink" target="rightframe">VOLUME_NOTIFICATION</A>
+</nobr><br>
+<!-- Class WebHistoryItem -->
+<A NAME="W"></A>
+<br><font size="+2">W</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.webkit.WebHistoryItem.html" class="hiddenlink" target="rightframe">WebHistoryItem</A><br>
+<!-- Class WebSettings -->
+<A HREF="android.webkit.WebSettings.html" class="hiddenlink" target="rightframe">WebSettings</A><br>
+<!-- Class WebView -->
+<A HREF="android.webkit.WebView.html" class="hiddenlink" target="rightframe">WebView</A><br>
+<!-- Field Widget_KeyboardView -->
+<nobr><A HREF="android.R.style.html#android.R.style.Widget_KeyboardView" class="hiddenlink" target="rightframe">Widget_KeyboardView</A>
+</nobr><br>
+<!-- Field WIFI_MAX_DHCP_RETRY_COUNT -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_MAX_DHCP_RETRY_COUNT" class="hiddenlink" target="rightframe">WIFI_MAX_DHCP_RETRY_COUNT</A>
+</nobr><br>
+<!-- Field WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS" class="hiddenlink" target="rightframe">WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS</A>
+</nobr><br>
+<!-- Field WIFI_MODE_FULL -->
+<nobr><A HREF="android.net.wifi.WifiManager.html#android.net.wifi.WifiManager.WIFI_MODE_FULL" class="hiddenlink" target="rightframe">WIFI_MODE_FULL</A>
+</nobr><br>
+<!-- Field WIFI_MODE_SCAN_ONLY -->
+<nobr><A HREF="android.net.wifi.WifiManager.html#android.net.wifi.WifiManager.WIFI_MODE_SCAN_ONLY" class="hiddenlink" target="rightframe">WIFI_MODE_SCAN_ONLY</A>
+</nobr><br>
+<!-- Field WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON" class="hiddenlink" target="rightframe">WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON</A>
+</nobr><br>
+<!-- Field WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY" class="hiddenlink" target="rightframe">WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY</A>
+</nobr><br>
+<!-- Field WIFI_NUM_OPEN_NETWORKS_KEPT -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_NUM_OPEN_NETWORKS_KEPT" class="hiddenlink" target="rightframe">WIFI_NUM_OPEN_NETWORKS_KEPT</A>
+</nobr><br>
+<!-- Field WIFI_ON -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_ON" class="hiddenlink" target="rightframe">WIFI_ON</A>
+</nobr><br>
+<!-- Field WIFI_SLEEP_POLICY -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_SLEEP_POLICY" class="hiddenlink" target="rightframe">WIFI_SLEEP_POLICY</A>
+</nobr><br>
+<!-- Field WIFI_SLEEP_POLICY_DEFAULT -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_SLEEP_POLICY_DEFAULT" class="hiddenlink" target="rightframe">WIFI_SLEEP_POLICY_DEFAULT</A>
+</nobr><br>
+<!-- Field WIFI_SLEEP_POLICY_NEVER -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_SLEEP_POLICY_NEVER" class="hiddenlink" target="rightframe">WIFI_SLEEP_POLICY_NEVER</A>
+</nobr><br>
+<!-- Field WIFI_SLEEP_POLICY_NEVER_WHILE_PLUGGED -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_SLEEP_POLICY_NEVER_WHILE_PLUGGED" class="hiddenlink" target="rightframe">WIFI_SLEEP_POLICY_NEVER_WHILE_PLUGGED</A>
+</nobr><br>
+<!-- Field WIFI_WATCHDOG_ACCEPTABLE_PACKET_LOSS_PERCENTAGE -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_WATCHDOG_ACCEPTABLE_PACKET_LOSS_PERCENTAGE" class="hiddenlink" target="rightframe">WIFI_WATCHDOG_ACCEPTABLE_PACKET_LOSS_PERCENTAGE</A>
+</nobr><br>
+<!-- Field WIFI_WATCHDOG_AP_COUNT -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_WATCHDOG_AP_COUNT" class="hiddenlink" target="rightframe">WIFI_WATCHDOG_AP_COUNT</A>
+</nobr><br>
+<!-- Field WIFI_WATCHDOG_BACKGROUND_CHECK_DELAY_MS -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_WATCHDOG_BACKGROUND_CHECK_DELAY_MS" class="hiddenlink" target="rightframe">WIFI_WATCHDOG_BACKGROUND_CHECK_DELAY_MS</A>
+</nobr><br>
+<!-- Field WIFI_WATCHDOG_BACKGROUND_CHECK_ENABLED -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_WATCHDOG_BACKGROUND_CHECK_ENABLED" class="hiddenlink" target="rightframe">WIFI_WATCHDOG_BACKGROUND_CHECK_ENABLED</A>
+</nobr><br>
+<!-- Field WIFI_WATCHDOG_BACKGROUND_CHECK_TIMEOUT_MS -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_WATCHDOG_BACKGROUND_CHECK_TIMEOUT_MS" class="hiddenlink" target="rightframe">WIFI_WATCHDOG_BACKGROUND_CHECK_TIMEOUT_MS</A>
+</nobr><br>
+<!-- Field WIFI_WATCHDOG_INITIAL_IGNORED_PING_COUNT -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_WATCHDOG_INITIAL_IGNORED_PING_COUNT" class="hiddenlink" target="rightframe">WIFI_WATCHDOG_INITIAL_IGNORED_PING_COUNT</A>
+</nobr><br>
+<!-- Field WIFI_WATCHDOG_MAX_AP_CHECKS -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_WATCHDOG_MAX_AP_CHECKS" class="hiddenlink" target="rightframe">WIFI_WATCHDOG_MAX_AP_CHECKS</A>
+</nobr><br>
+<!-- Field WIFI_WATCHDOG_ON -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_WATCHDOG_ON" class="hiddenlink" target="rightframe">WIFI_WATCHDOG_ON</A>
+</nobr><br>
+<!-- Field WIFI_WATCHDOG_PING_COUNT -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_WATCHDOG_PING_COUNT" class="hiddenlink" target="rightframe">WIFI_WATCHDOG_PING_COUNT</A>
+</nobr><br>
+<!-- Field WIFI_WATCHDOG_PING_DELAY_MS -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_WATCHDOG_PING_DELAY_MS" class="hiddenlink" target="rightframe">WIFI_WATCHDOG_PING_DELAY_MS</A>
+</nobr><br>
+<!-- Field WIFI_WATCHDOG_PING_TIMEOUT_MS -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_WATCHDOG_PING_TIMEOUT_MS" class="hiddenlink" target="rightframe">WIFI_WATCHDOG_PING_TIMEOUT_MS</A>
+</nobr><br>
+<!-- Class WifiManager -->
+<A HREF="android.net.wifi.WifiManager.html" class="hiddenlink" target="rightframe">WifiManager</A><br>
+<!-- Class Window -->
+<A HREF="android.view.Window.html" class="hiddenlink" target="rightframe">Window</A><br>
+<!-- Field windowDisablePreview -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.windowDisablePreview" class="hiddenlink" target="rightframe">windowDisablePreview</A>
+</nobr><br>
+<!-- Class WindowManager.LayoutParams -->
+<A HREF="android.view.WindowManager.LayoutParams.html" class="hiddenlink" target="rightframe">WindowManager.LayoutParams</A><br>
+<!-- Field windowNoDisplay -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.windowNoDisplay" class="hiddenlink" target="rightframe">windowNoDisplay</A>
+</nobr><br>
+<!-- Field windowSoftInputMode -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.windowSoftInputMode" class="hiddenlink" target="rightframe">windowSoftInputMode</A>
+</nobr><br>
+<!-- Field WRITE_SECURE_SETTINGS -->
+<nobr><A HREF="android.Manifest.permission.html#android.Manifest.permission.WRITE_SECURE_SETTINGS" class="hiddenlink" target="rightframe">WRITE_SECURE_SETTINGS</A>
+</nobr><br>
+<!-- Method writeMap -->
+<nobr><A HREF="android.os.Parcel.html#android.os.Parcel.writeMap_changed(java.util.Map)" class="hiddenlink" target="rightframe">writeMap
+(<code>Map</code>)</A></nobr><br>
+<!-- Method writeToParcel -->
+<i>writeToParcel</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.content.res.AssetFileDescriptor.html#android.content.res.AssetFileDescriptor.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.content.res.AssetFileDescriptor
+</A></nobr><br>
+<!-- Method writeToParcel -->
+&nbsp;&nbsp;<nobr><A HREF="android.graphics.RectF.html#android.graphics.RectF.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.graphics.RectF
+</A></nobr><br>
+<!-- Method writeToParcel -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.Annotation.html#android.text.Annotation.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.Annotation
+</A></nobr><br>
+<!-- Method writeToParcel -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.AbsoluteSizeSpan.html#android.text.style.AbsoluteSizeSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.AbsoluteSizeSpan
+</A></nobr><br>
+<!-- Method writeToParcel -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.AlignmentSpan.Standard.html#android.text.style.AlignmentSpan.Standard.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.AlignmentSpan.Standard
+</A></nobr><br>
+<!-- Method writeToParcel -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.BackgroundColorSpan.html#android.text.style.BackgroundColorSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.BackgroundColorSpan
+</A></nobr><br>
+<!-- Method writeToParcel -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.BulletSpan.html#android.text.style.BulletSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.BulletSpan
+</A></nobr><br>
+<!-- Method writeToParcel -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.ForegroundColorSpan.html#android.text.style.ForegroundColorSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.ForegroundColorSpan
+</A></nobr><br>
+<!-- Method writeToParcel -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.LeadingMarginSpan.Standard.html#android.text.style.LeadingMarginSpan.Standard.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.LeadingMarginSpan.Standard
+</A></nobr><br>
+<!-- Method writeToParcel -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.QuoteSpan.html#android.text.style.QuoteSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.QuoteSpan
+</A></nobr><br>
+<!-- Method writeToParcel -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.RelativeSizeSpan.html#android.text.style.RelativeSizeSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.RelativeSizeSpan
+</A></nobr><br>
+<!-- Method writeToParcel -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.ScaleXSpan.html#android.text.style.ScaleXSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.ScaleXSpan
+</A></nobr><br>
+<!-- Method writeToParcel -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.StrikethroughSpan.html#android.text.style.StrikethroughSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.StrikethroughSpan
+</A></nobr><br>
+<!-- Method writeToParcel -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.StyleSpan.html#android.text.style.StyleSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.StyleSpan
+</A></nobr><br>
+<!-- Method writeToParcel -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.SubscriptSpan.html#android.text.style.SubscriptSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.SubscriptSpan
+</A></nobr><br>
+<!-- Method writeToParcel -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.SuperscriptSpan.html#android.text.style.SuperscriptSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.SuperscriptSpan
+</A></nobr><br>
+<!-- Method writeToParcel -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.TextAppearanceSpan.html#android.text.style.TextAppearanceSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.TextAppearanceSpan
+</A></nobr><br>
+<!-- Method writeToParcel -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.TypefaceSpan.html#android.text.style.TypefaceSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.TypefaceSpan
+</A></nobr><br>
+<!-- Method writeToParcel -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.URLSpan.html#android.text.style.URLSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.URLSpan
+</A></nobr><br>
+<!-- Method writeToParcel -->
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.UnderlineSpan.html#android.text.style.UnderlineSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.UnderlineSpan
+</A></nobr><br>
+<!-- Method yieldIfContended -->
+<A NAME="Y"></A>
+<br><font size="+2">Y</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.database.sqlite.SQLiteDatabase.html#android.database.sqlite.SQLiteDatabase.yieldIfContended_changed()" class="hiddenlink" target="rightframe">yieldIfContended
+()</A></nobr><br>
+<!-- Method yieldIfContendedSafely -->
+<nobr><A HREF="android.database.sqlite.SQLiteDatabase.html#android.database.sqlite.SQLiteDatabase.yieldIfContendedSafely_added()" class="hiddenlink" target="rightframe"><b>yieldIfContendedSafely</b>
+()</A></nobr><br>
+<!-- Class Zygote -->
+<A NAME="Z"></A>
+<br><font size="+2">Z</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="dalvik.system.Zygote.html" class="hiddenlink" target="rightframe">Zygote</A><br>
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/alldiffs_index_changes.html b/docs/html/sdk/api_diff/3/changes/alldiffs_index_changes.html
new file mode 100644
index 000000000000..b35bdb35ce4b
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/alldiffs_index_changes.html
@@ -0,0 +1,1652 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+All Changes Index
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY class="gc-documentation">
+<a NAME="topheader"></a>
+<table summary="Index for All Differences" width="100%" class="jdiffIndex" border="0" cellspacing="0" cellpadding="0" style="padding-bottom:0;margin-bottom:0;">
+  <tr>
+  <th class="indexHeader">
+    Filter the Index:
+  </th>
+  </tr>
+  <tr>
+  <td class="indexText" style="line-height:1.3em;padding-left:2em;">
+<a href="alldiffs_index_all.html" xclass="hiddenlink">All Differences</a>
+  <br>
+<A HREF="alldiffs_index_removals.html" xclass="hiddenlink">Removals</A>
+  <br>
+<A HREF="alldiffs_index_additions.html"xclass="hiddenlink">Additions</A>
+  <br>
+<b>Changes</b>
+  </td>
+  </tr>
+</table>
+<div id="indexTableCaption">
+<font size="-2"><strong>Bold</strong>&nbsp;indicates&nbsp;New;&nbsp;<strike>Strike</strike>&nbsp;indicates&nbsp;deleted. Plain indicates changed.</font>
+</div>
+<!-- Class AbsListView -->
+<A NAME="A"></A>
+<br><font size="+2">A</font>&nbsp;
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.widget.AbsListView.html" class="hiddenlink" target="rightframe">AbsListView</A><br>
+<!-- Class AbsoluteLayout -->
+<A HREF="android.widget.AbsoluteLayout.html" class="hiddenlink" target="rightframe">AbsoluteLayout</A><br>
+<!-- Class AbsoluteSizeSpan -->
+<A HREF="android.text.style.AbsoluteSizeSpan.html" class="hiddenlink" target="rightframe">AbsoluteSizeSpan</A><br>
+<!-- Class AbsSeekBar -->
+<A HREF="android.widget.AbsSeekBar.html" class="hiddenlink" target="rightframe">AbsSeekBar</A><br>
+<!-- Class Activity -->
+<A HREF="android.app.Activity.html" class="hiddenlink" target="rightframe">Activity</A><br>
+<!-- Class ActivityInfo -->
+<A HREF="android.content.pm.ActivityInfo.html" class="hiddenlink" target="rightframe">ActivityInfo</A><br>
+<!-- Class ActivityInstrumentationTestCase -->
+<A HREF="android.test.ActivityInstrumentationTestCase.html" class="hiddenlink" target="rightframe">ActivityInstrumentationTestCase</A><br>
+<!-- Class ActivityManager -->
+<A HREF="android.app.ActivityManager.html" class="hiddenlink" target="rightframe">ActivityManager</A><br>
+<!-- Field ADB_ENABLED -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.ADB_ENABLED" class="hiddenlink" target="rightframe">ADB_ENABLED</A>
+</nobr><br>
+<!-- Method addRequirements -->
+<nobr><A HREF="android.test.suitebuilder.TestSuiteBuilder.html#android.test.suitebuilder.TestSuiteBuilder.addRequirements_changed(com.android.internal.util.Predicate<android.test.suitebuilder.TestMethod>...)" class="hiddenlink" target="rightframe">addRequirements
+(<code>Predicate&lt;TestMethod&gt;</code>)</A></nobr><br>
+<!-- Class AlarmManager -->
+<A HREF="android.app.AlarmManager.html" class="hiddenlink" target="rightframe">AlarmManager</A><br>
+<!-- Class AlertDialog -->
+<A HREF="android.app.AlertDialog.html" class="hiddenlink" target="rightframe">AlertDialog</A><br>
+<!-- Class AlignmentSpan.Standard -->
+<A HREF="android.text.style.AlignmentSpan.Standard.html" class="hiddenlink" target="rightframe">AlignmentSpan.Standard</A><br>
+<!-- Package android -->
+<A HREF="pkg_android.html" class="hiddenlink" target="rightframe">android</A><br>
+<!-- Package android.app -->
+<A HREF="pkg_android.app.html" class="hiddenlink" target="rightframe">android.app</A><br>
+<!-- Package android.content -->
+<A HREF="pkg_android.content.html" class="hiddenlink" target="rightframe">android.content</A><br>
+<!-- Package android.content.pm -->
+<A HREF="pkg_android.content.pm.html" class="hiddenlink" target="rightframe">android.content.pm</A><br>
+<!-- Package android.content.res -->
+<A HREF="pkg_android.content.res.html" class="hiddenlink" target="rightframe">android.content.res</A><br>
+<!-- Package android.database -->
+<A HREF="pkg_android.database.html" class="hiddenlink" target="rightframe">android.database</A><br>
+<!-- Package android.database.sqlite -->
+<A HREF="pkg_android.database.sqlite.html" class="hiddenlink" target="rightframe">android.database.sqlite</A><br>
+<!-- Package android.graphics -->
+<A HREF="pkg_android.graphics.html" class="hiddenlink" target="rightframe">android.graphics</A><br>
+<!-- Package android.graphics.drawable -->
+<A HREF="pkg_android.graphics.drawable.html" class="hiddenlink" target="rightframe">android.graphics.drawable</A><br>
+<!-- Package android.graphics.drawable.shapes -->
+<A HREF="pkg_android.graphics.drawable.shapes.html" class="hiddenlink" target="rightframe">android.graphics.drawable.shapes</A><br>
+<!-- Package android.hardware -->
+<A HREF="pkg_android.hardware.html" class="hiddenlink" target="rightframe">android.hardware</A><br>
+<!-- Package android.location -->
+<A HREF="pkg_android.location.html" class="hiddenlink" target="rightframe">android.location</A><br>
+<!-- Package android.media -->
+<A HREF="pkg_android.media.html" class="hiddenlink" target="rightframe">android.media</A><br>
+<!-- Package android.net -->
+<A HREF="pkg_android.net.html" class="hiddenlink" target="rightframe">android.net</A><br>
+<!-- Package android.net.wifi -->
+<A HREF="pkg_android.net.wifi.html" class="hiddenlink" target="rightframe">android.net.wifi</A><br>
+<!-- Package android.opengl -->
+<A HREF="pkg_android.opengl.html" class="hiddenlink" target="rightframe">android.opengl</A><br>
+<!-- Package android.os -->
+<A HREF="pkg_android.os.html" class="hiddenlink" target="rightframe">android.os</A><br>
+<!-- Package android.preference -->
+<A HREF="pkg_android.preference.html" class="hiddenlink" target="rightframe">android.preference</A><br>
+<!-- Package android.provider -->
+<A HREF="pkg_android.provider.html" class="hiddenlink" target="rightframe">android.provider</A><br>
+<!-- Package android.telephony -->
+<A HREF="pkg_android.telephony.html" class="hiddenlink" target="rightframe">android.telephony</A><br>
+<!-- Package android.telephony.gsm -->
+<A HREF="pkg_android.telephony.gsm.html" class="hiddenlink" target="rightframe">android.telephony.gsm</A><br>
+<!-- Package android.test -->
+<A HREF="pkg_android.test.html" class="hiddenlink" target="rightframe">android.test</A><br>
+<!-- Package android.test.mock -->
+<A HREF="pkg_android.test.mock.html" class="hiddenlink" target="rightframe">android.test.mock</A><br>
+<!-- Package android.test.suitebuilder -->
+<A HREF="pkg_android.test.suitebuilder.html" class="hiddenlink" target="rightframe">android.test.suitebuilder</A><br>
+<!-- Package android.text -->
+<A HREF="pkg_android.text.html" class="hiddenlink" target="rightframe">android.text</A><br>
+<!-- Package android.text.method -->
+<A HREF="pkg_android.text.method.html" class="hiddenlink" target="rightframe">android.text.method</A><br>
+<!-- Package android.text.style -->
+<A HREF="pkg_android.text.style.html" class="hiddenlink" target="rightframe">android.text.style</A><br>
+<!-- Package android.util -->
+<A HREF="pkg_android.util.html" class="hiddenlink" target="rightframe">android.util</A><br>
+<!-- Package android.view -->
+<A HREF="pkg_android.view.html" class="hiddenlink" target="rightframe">android.view</A><br>
+<!-- Package android.view.animation -->
+<A HREF="pkg_android.view.animation.html" class="hiddenlink" target="rightframe">android.view.animation</A><br>
+<!-- Package android.webkit -->
+<A HREF="pkg_android.webkit.html" class="hiddenlink" target="rightframe">android.webkit</A><br>
+<!-- Package android.widget -->
+<A HREF="pkg_android.widget.html" class="hiddenlink" target="rightframe">android.widget</A><br>
+<!-- Field ANDROID_ID -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.ANDROID_ID" class="hiddenlink" target="rightframe">ANDROID_ID</A>
+</nobr><br>
+<!-- Class Animation -->
+<A HREF="android.view.animation.Animation.html" class="hiddenlink" target="rightframe">Animation</A><br>
+<!-- Class Annotation -->
+<A HREF="android.text.Annotation.html" class="hiddenlink" target="rightframe">Annotation</A><br>
+<!-- Method appendEscapedSQLString -->
+<nobr><A HREF="android.database.DatabaseUtils.html#android.database.DatabaseUtils.appendEscapedSQLString_changed(java.lang.StringBuilder, java.lang.String)" class="hiddenlink" target="rightframe">appendEscapedSQLString
+(<code>StringBuilder, String</code>)</A></nobr><br>
+<!-- Class ArrayAdapter -->
+<A HREF="android.widget.ArrayAdapter.html" class="hiddenlink" target="rightframe">ArrayAdapter</A><br>
+<!-- Class ArrowKeyMovementMethod -->
+<A HREF="android.text.method.ArrowKeyMovementMethod.html" class="hiddenlink" target="rightframe">ArrowKeyMovementMethod</A><br>
+<!-- Class AssetFileDescriptor -->
+<A HREF="android.content.res.AssetFileDescriptor.html" class="hiddenlink" target="rightframe">AssetFileDescriptor</A><br>
+<!-- Class AudioManager -->
+<A HREF="android.media.AudioManager.html" class="hiddenlink" target="rightframe">AudioManager</A><br>
+<!-- Class AutoCompleteTextView -->
+<A HREF="android.widget.AutoCompleteTextView.html" class="hiddenlink" target="rightframe">AutoCompleteTextView</A><br>
+<!-- Class AutoText -->
+<A HREF="android.text.AutoText.html" class="hiddenlink" target="rightframe">AutoText</A><br>
+<!-- Field autoText -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.autoText" class="hiddenlink" target="rightframe">autoText</A>
+</nobr><br>
+<!-- Class BackgroundColorSpan -->
+<A NAME="B"></A>
+<br><font size="+2">B</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.text.style.BackgroundColorSpan.html" class="hiddenlink" target="rightframe">BackgroundColorSpan</A><br>
+<!-- Class BaseKeyListener -->
+<A HREF="android.text.method.BaseKeyListener.html" class="hiddenlink" target="rightframe">BaseKeyListener</A><br>
+<!-- Class Binder -->
+<A HREF="android.os.Binder.html" class="hiddenlink" target="rightframe">Binder</A><br>
+<!-- Class Bitmap -->
+<A HREF="android.graphics.Bitmap.html" class="hiddenlink" target="rightframe">Bitmap</A><br>
+<!-- Field BLUETOOTH_ON -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.BLUETOOTH_ON" class="hiddenlink" target="rightframe">BLUETOOTH_ON</A>
+</nobr><br>
+<!-- Class BroadcastReceiver -->
+<A HREF="android.content.BroadcastReceiver.html" class="hiddenlink" target="rightframe">BroadcastReceiver</A><br>
+<!-- Class Browser -->
+<A HREF="android.provider.Browser.html" class="hiddenlink" target="rightframe">Browser</A><br>
+<!-- Class Build -->
+<A HREF="android.os.Build.html" class="hiddenlink" target="rightframe">Build</A><br>
+<!-- Class BulletSpan -->
+<A HREF="android.text.style.BulletSpan.html" class="hiddenlink" target="rightframe">BulletSpan</A><br>
+<!-- Field BUTTON1 -->
+<nobr><A HREF="android.content.DialogInterface.html#android.content.DialogInterface.BUTTON1" class="hiddenlink" target="rightframe">BUTTON1</A>
+</nobr><br>
+<!-- Field BUTTON2 -->
+<nobr><A HREF="android.content.DialogInterface.html#android.content.DialogInterface.BUTTON2" class="hiddenlink" target="rightframe">BUTTON2</A>
+</nobr><br>
+<!-- Field BUTTON3 -->
+<nobr><A HREF="android.content.DialogInterface.html#android.content.DialogInterface.BUTTON3" class="hiddenlink" target="rightframe">BUTTON3</A>
+</nobr><br>
+<!-- Class Camera -->
+<A NAME="C"></A>
+<br><font size="+2">C</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.hardware.Camera.html" class="hiddenlink" target="rightframe">Camera</A><br>
+<!-- Class Canvas -->
+<A HREF="android.graphics.Canvas.html" class="hiddenlink" target="rightframe">Canvas</A><br>
+<!-- Field capitalize -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.capitalize" class="hiddenlink" target="rightframe">capitalize</A>
+</nobr><br>
+<!-- Method changeDebugPort -->
+<nobr><A HREF="android.os.Debug.html#android.os.Debug.changeDebugPort_changed(int)" class="hiddenlink" target="rightframe">changeDebugPort
+(<code>int</code>)</A></nobr><br>
+<!-- Class Character.UnicodeBlock -->
+<A HREF="java.lang.Character.UnicodeBlock.html" class="hiddenlink" target="rightframe">Character.UnicodeBlock</A><br>
+<!-- Class Chronometer -->
+<A HREF="android.widget.Chronometer.html" class="hiddenlink" target="rightframe">Chronometer</A><br>
+<!-- Class Class -->
+<A HREF="java.lang.Class.html" class="hiddenlink" target="rightframe">Class</A><br>
+<!-- Class ClickableSpan -->
+<A HREF="android.text.style.ClickableSpan.html" class="hiddenlink" target="rightframe">ClickableSpan</A><br>
+<!-- Method clone -->
+<nobr><A HREF="android.graphics.drawable.shapes.Shape.html#android.graphics.drawable.shapes.Shape.clone_changed()" class="hiddenlink" target="rightframe">clone
+()</A></nobr><br>
+<!-- Class Configuration -->
+<A HREF="android.content.res.Configuration.html" class="hiddenlink" target="rightframe">Configuration</A><br>
+<!-- Class ConnectivityManager -->
+<A HREF="android.net.ConnectivityManager.html" class="hiddenlink" target="rightframe">ConnectivityManager</A><br>
+<!-- Class Contacts.Intents -->
+<A HREF="android.provider.Contacts.Intents.html" class="hiddenlink" target="rightframe">Contacts.Intents</A><br>
+<!-- Class Contacts.Intents.Insert -->
+<A HREF="android.provider.Contacts.Intents.Insert.html" class="hiddenlink" target="rightframe">Contacts.Intents.Insert</A><br>
+<!-- Class Contacts.PeopleColumns -->
+<A HREF="android.provider.Contacts.PeopleColumns.html" class="hiddenlink" target="rightframe"><i>Contacts.PeopleColumns</i></A><br>
+<!-- Class ContentProvider -->
+<A HREF="android.content.ContentProvider.html" class="hiddenlink" target="rightframe">ContentProvider</A><br>
+<!-- Class ContentResolver -->
+<A HREF="android.content.ContentResolver.html" class="hiddenlink" target="rightframe">ContentResolver</A><br>
+<!-- Class Context -->
+<A HREF="android.content.Context.html" class="hiddenlink" target="rightframe">Context</A><br>
+<!-- Class Cursor -->
+<A HREF="android.database.Cursor.html" class="hiddenlink" target="rightframe"><i>Cursor</i></A><br>
+<!-- Class CursorAdapter -->
+<A HREF="android.widget.CursorAdapter.html" class="hiddenlink" target="rightframe">CursorAdapter</A><br>
+<!-- Class CursorWrapper -->
+<A HREF="android.database.CursorWrapper.html" class="hiddenlink" target="rightframe">CursorWrapper</A><br>
+<!-- Package dalvik.system -->
+<A NAME="D"></A>
+<A HREF="pkg_dalvik.system.html" class="hiddenlink" target="rightframe">dalvik.system</A><br>
+<!-- Field DATA_ROAMING -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.DATA_ROAMING" class="hiddenlink" target="rightframe">DATA_ROAMING</A>
+</nobr><br>
+<!-- Field DATA_X -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.DATA_X" class="hiddenlink" target="rightframe">DATA_X</A>
+</nobr><br>
+<!-- Field DATA_Y -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.DATA_Y" class="hiddenlink" target="rightframe">DATA_Y</A>
+</nobr><br>
+<!-- Field DATA_Z -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.DATA_Z" class="hiddenlink" target="rightframe">DATA_Z</A>
+</nobr><br>
+<!-- Class DatabaseUtils -->
+<A HREF="android.database.DatabaseUtils.html" class="hiddenlink" target="rightframe">DatabaseUtils</A><br>
+<!-- Class Date -->
+<i>Date</i><br>
+&nbsp;&nbsp;<A HREF="java.util.Date.html" class="hiddenlink" target="rightframe">java.util</A><br>
+<!-- Constructor Date -->
+&nbsp;&nbsp;<nobr><A HREF="java.util.Date.html#java.util.Date.ctor_changed()" class="hiddenlink" target="rightframe">Date
+()</A></nobr>&nbsp;constructor<br>
+<!-- Constructor Date -->
+&nbsp;&nbsp;<nobr><A HREF="java.util.Date.html#java.util.Date.ctor_changed(int, int, int, int, int, int)" class="hiddenlink" target="rightframe">Date
+(<code>int, int, int, int, int, int</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Class DateKeyListener -->
+<A HREF="android.text.method.DateKeyListener.html" class="hiddenlink" target="rightframe">DateKeyListener</A><br>
+<!-- Class DateTimeKeyListener -->
+<A HREF="android.text.method.DateTimeKeyListener.html" class="hiddenlink" target="rightframe">DateTimeKeyListener</A><br>
+<!-- Class Debug -->
+<A HREF="android.os.Debug.html" class="hiddenlink" target="rightframe">Debug</A><br>
+<!-- Field DEFAULT_SORT_ORDER -->
+<i>DEFAULT_SORT_ORDER</i><br>
+&nbsp;in&nbsp;
+<nobr><A HREF="android.provider.MediaStore.Images.Media.html#android.provider.MediaStore.Images.Media.DEFAULT_SORT_ORDER" class="hiddenlink" target="rightframe">android.provider.MediaStore.Images.Media</A>
+</nobr><br>
+<!-- Field DEFAULT_SORT_ORDER -->
+&nbsp;in&nbsp;
+<nobr><A HREF="android.provider.MediaStore.Video.html#android.provider.MediaStore.Video.DEFAULT_SORT_ORDER" class="hiddenlink" target="rightframe">android.provider.MediaStore.Video</A>
+</nobr><br>
+<!-- Field DEVICE_PROVISIONED -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.DEVICE_PROVISIONED" class="hiddenlink" target="rightframe">DEVICE_PROVISIONED</A>
+</nobr><br>
+<!-- Class DexFile -->
+<A HREF="dalvik.system.DexFile.html" class="hiddenlink" target="rightframe">DexFile</A><br>
+<!-- Class DialerKeyListener -->
+<A HREF="android.text.method.DialerKeyListener.html" class="hiddenlink" target="rightframe">DialerKeyListener</A><br>
+<!-- Class DialogInterface -->
+<A HREF="android.content.DialogInterface.html" class="hiddenlink" target="rightframe"><i>DialogInterface</i></A><br>
+<!-- Class DialogPreference -->
+<A HREF="android.preference.DialogPreference.html" class="hiddenlink" target="rightframe">DialogPreference</A><br>
+<!-- Class DigitsKeyListener -->
+<A HREF="android.text.method.DigitsKeyListener.html" class="hiddenlink" target="rightframe">DigitsKeyListener</A><br>
+<!-- Method drag -->
+<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.drag_changed(android.test.ActivityInstrumentationTestCase, float, float, float, float, int)" class="hiddenlink" target="rightframe">drag
+(<code>ActivityInstrumentationTestCase, float, float, float, float, int</code>)</A></nobr><br>
+<!-- Method dragQuarterScreenDown -->
+<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragQuarterScreenDown_changed(android.test.ActivityInstrumentationTestCase)" class="hiddenlink" target="rightframe">dragQuarterScreenDown
+(<code>ActivityInstrumentationTestCase</code>)</A></nobr><br>
+<!-- Method dragQuarterScreenUp -->
+<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragQuarterScreenUp_changed(android.test.ActivityInstrumentationTestCase)" class="hiddenlink" target="rightframe">dragQuarterScreenUp
+(<code>ActivityInstrumentationTestCase</code>)</A></nobr><br>
+<!-- Method dragViewBy -->
+<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewBy_changed(android.test.ActivityInstrumentationTestCase, android.view.View, int, int, int)" class="hiddenlink" target="rightframe">dragViewBy
+(<code>ActivityInstrumentationTestCase, View, int, int, int</code>)</A></nobr><br>
+<!-- Method dragViewTo -->
+<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewTo_changed(android.test.ActivityInstrumentationTestCase, android.view.View, int, int, int)" class="hiddenlink" target="rightframe">dragViewTo
+(<code>ActivityInstrumentationTestCase, View, int, int, int</code>)</A></nobr><br>
+<!-- Method dragViewToBottom -->
+<i>dragViewToBottom</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewToBottom_changed(android.test.ActivityInstrumentationTestCase, android.view.View)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>ActivityInstrumentationTestCase, View</code>)&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+<!-- Method dragViewToBottom -->
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewToBottom_changed(android.test.InstrumentationTestCase, android.app.Activity, android.view.View)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>InstrumentationTestCase, Activity, View</code>)&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+<!-- Method dragViewToTop -->
+<i>dragViewToTop</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewToTop_changed(android.test.ActivityInstrumentationTestCase, android.view.View)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>ActivityInstrumentationTestCase, View</code>)&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+<!-- Method dragViewToTop -->
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewToTop_changed(android.test.ActivityInstrumentationTestCase, android.view.View, int)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>ActivityInstrumentationTestCase, View, int</code>)&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+<!-- Method dragViewToX -->
+<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewToX_changed(android.test.ActivityInstrumentationTestCase, android.view.View, int, int)" class="hiddenlink" target="rightframe">dragViewToX
+(<code>ActivityInstrumentationTestCase, View, int, int</code>)</A></nobr><br>
+<!-- Method dragViewToY -->
+<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewToY_changed(android.test.ActivityInstrumentationTestCase, android.view.View, int, int)" class="hiddenlink" target="rightframe">dragViewToY
+(<code>ActivityInstrumentationTestCase, View, int, int</code>)</A></nobr><br>
+<!-- Class Drawable -->
+<A HREF="android.graphics.drawable.Drawable.html" class="hiddenlink" target="rightframe">Drawable</A><br>
+<!-- Class DynamicDrawableSpan -->
+<A HREF="android.text.style.DynamicDrawableSpan.html" class="hiddenlink" target="rightframe">DynamicDrawableSpan</A><br>
+<!-- Field editable -->
+<A NAME="E"></A>
+<br><font size="+2">E</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.R.attr.html#android.R.attr.editable" class="hiddenlink" target="rightframe">editable</A>
+</nobr><br>
+<!-- Field enabled -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.enabled" class="hiddenlink" target="rightframe">enabled</A>
+</nobr><br>
+<!-- Class Environment -->
+<A HREF="android.os.Environment.html" class="hiddenlink" target="rightframe">Environment</A><br>
+<!-- Class ForegroundColorSpan -->
+<A NAME="F"></A>
+<br><font size="+2">F</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.text.style.ForegroundColorSpan.html" class="hiddenlink" target="rightframe">ForegroundColorSpan</A><br>
+<!-- Method forkAndSpecialize -->
+<nobr><A HREF="dalvik.system.Zygote.html#dalvik.system.Zygote.forkAndSpecialize_changed(int, int, int[], boolean, int[][])" class="hiddenlink" target="rightframe">forkAndSpecialize
+(<code>int, int, int[], boolean, int[][]</code>)</A></nobr><br>
+<!-- Method forkSystemServer -->
+<nobr><A HREF="dalvik.system.Zygote.html#dalvik.system.Zygote.forkSystemServer_changed(int, int, int[], boolean, int[][])" class="hiddenlink" target="rightframe">forkSystemServer
+(<code>int, int, int[], boolean, int[][]</code>)</A></nobr><br>
+<!-- Method forName -->
+<nobr><A HREF="java.lang.Character.UnicodeBlock.html#java.lang.Character.UnicodeBlock.forName_changed(java.lang.String)" class="hiddenlink" target="rightframe">forName
+(<code>String</code>)</A></nobr><br>
+<!-- Class GestureDetector -->
+<A NAME="G"></A>
+<br><font size="+2">G</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<i>GestureDetector</i><br>
+&nbsp;&nbsp;<A HREF="android.view.GestureDetector.html" class="hiddenlink" target="rightframe">android.view</A><br>
+<!-- Constructor GestureDetector -->
+&nbsp;&nbsp;<nobr><A HREF="android.view.GestureDetector.html#android.view.GestureDetector.ctor_changed(android.view.GestureDetector.OnGestureListener)" class="hiddenlink" target="rightframe">GestureDetector
+(<code>OnGestureListener</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Constructor GestureDetector -->
+&nbsp;&nbsp;<nobr><A HREF="android.view.GestureDetector.html#android.view.GestureDetector.ctor_changed(android.view.GestureDetector.OnGestureListener, android.os.Handler)" class="hiddenlink" target="rightframe">GestureDetector
+(<code>OnGestureListener, Handler</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Class GestureDetector.SimpleOnGestureListener -->
+<A HREF="android.view.GestureDetector.SimpleOnGestureListener.html" class="hiddenlink" target="rightframe">GestureDetector.SimpleOnGestureListener</A><br>
+<!-- Method getClasses -->
+<nobr><A HREF="java.lang.Class.html#java.lang.Class.getClasses_changed()" class="hiddenlink" target="rightframe">getClasses
+()</A></nobr><br>
+<!-- Method getColumnIndex -->
+<i>getColumnIndex</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.database.Cursor.html#android.database.Cursor.getColumnIndex_changed(java.lang.String)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>String</code>)&nbsp;in&nbsp;android.database.Cursor
+</A></nobr><br>
+<!-- Method getColumnIndex -->
+&nbsp;&nbsp;<nobr><A HREF="android.database.CursorWrapper.html#android.database.CursorWrapper.getColumnIndex_changed(java.lang.String)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>String</code>)&nbsp;in&nbsp;android.database.CursorWrapper
+</A></nobr><br>
+<!-- Method getConstructors -->
+<nobr><A HREF="java.lang.Class.html#java.lang.Class.getConstructors_changed()" class="hiddenlink" target="rightframe">getConstructors
+()</A></nobr><br>
+<!-- Method getCount -->
+<nobr><A HREF="android.widget.CursorAdapter.html#android.widget.CursorAdapter.getCount_changed()" class="hiddenlink" target="rightframe">getCount
+()</A></nobr><br>
+<!-- Method getDeclaredClasses -->
+<nobr><A HREF="java.lang.Class.html#java.lang.Class.getDeclaredClasses_changed()" class="hiddenlink" target="rightframe">getDeclaredClasses
+()</A></nobr><br>
+<!-- Method getDeclaredConstructors -->
+<nobr><A HREF="java.lang.Class.html#java.lang.Class.getDeclaredConstructors_changed()" class="hiddenlink" target="rightframe">getDeclaredConstructors
+()</A></nobr><br>
+<!-- Method getEdgeSlop -->
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getEdgeSlop_changed()" class="hiddenlink" target="rightframe">getEdgeSlop
+()</A></nobr><br>
+<!-- Method getFadingEdgeLength -->
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getFadingEdgeLength_changed()" class="hiddenlink" target="rightframe">getFadingEdgeLength
+()</A></nobr><br>
+<!-- Method getHandler -->
+<nobr><A HREF="android.view.View.html#android.view.View.getHandler_changed()" class="hiddenlink" target="rightframe">getHandler
+()</A></nobr><br>
+<!-- Method getInterfaces -->
+<nobr><A HREF="java.lang.Class.html#java.lang.Class.getInterfaces_changed()" class="hiddenlink" target="rightframe">getInterfaces
+()</A></nobr><br>
+<!-- Method getItem -->
+<nobr><A HREF="android.widget.CursorAdapter.html#android.widget.CursorAdapter.getItem_changed(int)" class="hiddenlink" target="rightframe">getItem
+(<code>int</code>)</A></nobr><br>
+<!-- Method getItemClickListener -->
+<nobr><A HREF="android.widget.AutoCompleteTextView.html#android.widget.AutoCompleteTextView.getItemClickListener_changed()" class="hiddenlink" target="rightframe">getItemClickListener
+()</A></nobr><br>
+<!-- Method getItemId -->
+<nobr><A HREF="android.widget.CursorAdapter.html#android.widget.CursorAdapter.getItemId_changed(int)" class="hiddenlink" target="rightframe">getItemId
+(<code>int</code>)</A></nobr><br>
+<!-- Method getItemSelectedListener -->
+<nobr><A HREF="android.widget.AutoCompleteTextView.html#android.widget.AutoCompleteTextView.getItemSelectedListener_changed()" class="hiddenlink" target="rightframe">getItemSelectedListener
+()</A></nobr><br>
+<!-- Method getMaximumDrawingCacheSize -->
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getMaximumDrawingCacheSize_changed()" class="hiddenlink" target="rightframe">getMaximumDrawingCacheSize
+()</A></nobr><br>
+<!-- Method getMinimumFlingVelocity -->
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getMinimumFlingVelocity_changed()" class="hiddenlink" target="rightframe">getMinimumFlingVelocity
+()</A></nobr><br>
+<!-- Method getProxyClass -->
+<nobr><A HREF="java.lang.reflect.Proxy.html#java.lang.reflect.Proxy.getProxyClass_changed(java.lang.ClassLoader, java.lang.Class<?>...)" class="hiddenlink" target="rightframe">getProxyClass
+(<code>ClassLoader, Class&lt;?&gt;</code>)</A></nobr><br>
+<!-- Method getScrollBarSize -->
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getScrollBarSize_changed()" class="hiddenlink" target="rightframe">getScrollBarSize
+()</A></nobr><br>
+<!-- Method getSensors -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.getSensors_changed()" class="hiddenlink" target="rightframe">getSensors
+()</A></nobr><br>
+<!-- Method getSurrogate -->
+<nobr><A HREF="android.webkit.UrlInterceptRegistry.html#android.webkit.UrlInterceptRegistry.getSurrogate_changed(java.lang.String, java.util.Map<java.lang.String, java.lang.String>)" class="hiddenlink" target="rightframe">getSurrogate
+(<code>String, Map&lt;String, String&gt;</code>)</A></nobr><br>
+<!-- Method getTargetIntent -->
+<nobr><A HREF="android.app.LauncherActivity.html#android.app.LauncherActivity.getTargetIntent_changed()" class="hiddenlink" target="rightframe">getTargetIntent
+()</A></nobr><br>
+<!-- Method getTouchSlop -->
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getTouchSlop_changed()" class="hiddenlink" target="rightframe">getTouchSlop
+()</A></nobr><br>
+<!-- Method getUserAgent -->
+<nobr><A HREF="android.webkit.WebSettings.html#android.webkit.WebSettings.getUserAgent_changed()" class="hiddenlink" target="rightframe">getUserAgent
+()</A></nobr><br>
+<!-- Method getWindowTouchSlop -->
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getWindowTouchSlop_changed()" class="hiddenlink" target="rightframe">getWindowTouchSlop
+()</A></nobr><br>
+<!-- Method getZoomControls -->
+<nobr><A HREF="android.webkit.WebView.html#android.webkit.WebView.getZoomControls_changed()" class="hiddenlink" target="rightframe">getZoomControls
+()</A></nobr><br>
+<!-- Class Gravity -->
+<A HREF="android.view.Gravity.html" class="hiddenlink" target="rightframe">Gravity</A><br>
+<!-- Class GridView -->
+<A HREF="android.widget.GridView.html" class="hiddenlink" target="rightframe">GridView</A><br>
+<!-- Class Handler -->
+<A NAME="H"></A>
+<br><font size="+2">H</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.os.Handler.html" class="hiddenlink" target="rightframe">Handler</A><br>
+<!-- Field HTTP_PROXY -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.HTTP_PROXY" class="hiddenlink" target="rightframe">HTTP_PROXY</A>
+</nobr><br>
+<!-- Class IBinder -->
+<A NAME="I"></A>
+<br><font size="+2">I</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.os.IBinder.html" class="hiddenlink" target="rightframe"><i>IBinder</i></A><br>
+<!-- Class ImageSpan -->
+<A HREF="android.text.style.ImageSpan.html" class="hiddenlink" target="rightframe">ImageSpan</A><br>
+<!-- Field inputMethod -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.inputMethod" class="hiddenlink" target="rightframe">inputMethod</A>
+</nobr><br>
+<!-- Field INSTALL_NON_MARKET_APPS -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.INSTALL_NON_MARKET_APPS" class="hiddenlink" target="rightframe">INSTALL_NON_MARKET_APPS</A>
+</nobr><br>
+<!-- Class Instrumentation -->
+<A HREF="android.app.Instrumentation.html" class="hiddenlink" target="rightframe">Instrumentation</A><br>
+<!-- Class InstrumentationTestCase -->
+<A HREF="android.test.InstrumentationTestCase.html" class="hiddenlink" target="rightframe">InstrumentationTestCase</A><br>
+<!-- Class Intent -->
+<A HREF="android.content.Intent.html" class="hiddenlink" target="rightframe">Intent</A><br>
+<!-- Method isCookielessProxyUrl -->
+<nobr><A HREF="android.webkit.URLUtil.html#android.webkit.URLUtil.isCookielessProxyUrl_changed(java.lang.String)" class="hiddenlink" target="rightframe">isCookielessProxyUrl
+(<code>String</code>)</A></nobr><br>
+<!-- Package java.lang -->
+<A NAME="J"></A>
+<A HREF="pkg_java.lang.html" class="hiddenlink" target="rightframe">java.lang</A><br>
+<!-- Package java.lang.reflect -->
+<A HREF="pkg_java.lang.reflect.html" class="hiddenlink" target="rightframe">java.lang.reflect</A><br>
+<!-- Package java.net -->
+<A HREF="pkg_java.net.html" class="hiddenlink" target="rightframe">java.net</A><br>
+<!-- Package java.util -->
+<A HREF="pkg_java.util.html" class="hiddenlink" target="rightframe">java.util</A><br>
+<!-- Package java.util.jar -->
+<A HREF="pkg_java.util.jar.html" class="hiddenlink" target="rightframe">java.util.jar</A><br>
+<!-- Package java.util.logging -->
+<A HREF="pkg_java.util.logging.html" class="hiddenlink" target="rightframe">java.util.logging</A><br>
+<!-- Class KeyCharacterMap -->
+<A NAME="K"></A>
+<br><font size="+2">K</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.view.KeyCharacterMap.html" class="hiddenlink" target="rightframe">KeyCharacterMap</A><br>
+<!-- Class KeyEvent -->
+<A HREF="android.view.KeyEvent.html" class="hiddenlink" target="rightframe">KeyEvent</A><br>
+<!-- Class KeyListener -->
+<A HREF="android.text.method.KeyListener.html" class="hiddenlink" target="rightframe"><i>KeyListener</i></A><br>
+<!-- Class LauncherActivity -->
+<A NAME="L"></A>
+<br><font size="+2">L</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.app.LauncherActivity.html" class="hiddenlink" target="rightframe">LauncherActivity</A><br>
+<!-- Class LeadingMarginSpan.Standard -->
+<A HREF="android.text.style.LeadingMarginSpan.Standard.html" class="hiddenlink" target="rightframe">LeadingMarginSpan.Standard</A><br>
+<!-- Class Level -->
+<A HREF="java.util.logging.Level.html" class="hiddenlink" target="rightframe">Level</A><br>
+<!-- Field LIGHT_NO_MOON -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.LIGHT_NO_MOON" class="hiddenlink" target="rightframe">LIGHT_NO_MOON</A>
+</nobr><br>
+<!-- Class ListView -->
+<A HREF="android.widget.ListView.html" class="hiddenlink" target="rightframe">ListView</A><br>
+<!-- Class Location -->
+<A HREF="android.location.Location.html" class="hiddenlink" target="rightframe">Location</A><br>
+<!-- Field LOCATION_PROVIDERS_ALLOWED -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.LOCATION_PROVIDERS_ALLOWED" class="hiddenlink" target="rightframe">LOCATION_PROVIDERS_ALLOWED</A>
+</nobr><br>
+<!-- Class LocationManager -->
+<A HREF="android.location.LocationManager.html" class="hiddenlink" target="rightframe">LocationManager</A><br>
+<!-- Field LOGGING_ID -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.LOGGING_ID" class="hiddenlink" target="rightframe">LOGGING_ID</A>
+</nobr><br>
+<!-- Class LogManager -->
+<A HREF="java.util.logging.LogManager.html" class="hiddenlink" target="rightframe">LogManager</A><br>
+<!-- Method longClickView -->
+<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.longClickView_changed(android.test.ActivityInstrumentationTestCase, android.view.View)" class="hiddenlink" target="rightframe">longClickView
+(<code>ActivityInstrumentationTestCase, View</code>)</A></nobr><br>
+<!-- Class Looper -->
+<A HREF="android.os.Looper.html" class="hiddenlink" target="rightframe">Looper</A><br>
+<!-- Class Manifest.permission -->
+<A NAME="M"></A>
+<br><font size="+2">M</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.Manifest.permission.html" class="hiddenlink" target="rightframe">Manifest.permission</A><br>
+<!-- Class MaskFilterSpan -->
+<A HREF="android.text.style.MaskFilterSpan.html" class="hiddenlink" target="rightframe">MaskFilterSpan</A><br>
+<!-- Field MAX_KEYCODE -->
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.MAX_KEYCODE" class="hiddenlink" target="rightframe">MAX_KEYCODE</A>
+</nobr><br>
+<!-- Class MediaPlayer -->
+<A HREF="android.media.MediaPlayer.html" class="hiddenlink" target="rightframe">MediaPlayer</A><br>
+<!-- Class MediaRecorder -->
+<A HREF="android.media.MediaRecorder.html" class="hiddenlink" target="rightframe">MediaRecorder</A><br>
+<!-- Class MediaRecorder.OutputFormat -->
+<A HREF="android.media.MediaRecorder.OutputFormat.html" class="hiddenlink" target="rightframe">MediaRecorder.OutputFormat</A><br>
+<!-- Class MediaStore -->
+<A HREF="android.provider.MediaStore.html" class="hiddenlink" target="rightframe">MediaStore</A><br>
+<!-- Class MediaStore.Audio.AlbumColumns -->
+<A HREF="android.provider.MediaStore.Audio.AlbumColumns.html" class="hiddenlink" target="rightframe"><i>MediaStore.Audio.AlbumColumns</i></A><br>
+<!-- Class MediaStore.Audio.Media -->
+<A HREF="android.provider.MediaStore.Audio.Media.html" class="hiddenlink" target="rightframe">MediaStore.Audio.Media</A><br>
+<!-- Class MediaStore.Images.Media -->
+<A HREF="android.provider.MediaStore.Images.Media.html" class="hiddenlink" target="rightframe">MediaStore.Images.Media</A><br>
+<!-- Class MediaStore.Video -->
+<A HREF="android.provider.MediaStore.Video.html" class="hiddenlink" target="rightframe">MediaStore.Video</A><br>
+<!-- Class MediaStore.Video.VideoColumns -->
+<A HREF="android.provider.MediaStore.Video.VideoColumns.html" class="hiddenlink" target="rightframe"><i>MediaStore.Video.VideoColumns</i></A><br>
+<!-- Class Menu -->
+<A HREF="android.view.Menu.html" class="hiddenlink" target="rightframe"><i>Menu</i></A><br>
+<!-- Class MetaKeyKeyListener -->
+<A HREF="android.text.method.MetaKeyKeyListener.html" class="hiddenlink" target="rightframe">MetaKeyKeyListener</A><br>
+<!-- Class MockPackageManager -->
+<A HREF="android.test.mock.MockPackageManager.html" class="hiddenlink" target="rightframe">MockPackageManager</A><br>
+<!-- Class MotionEvent -->
+<A HREF="android.view.MotionEvent.html" class="hiddenlink" target="rightframe">MotionEvent</A><br>
+<!-- Class MovementMethod -->
+<A HREF="android.text.method.MovementMethod.html" class="hiddenlink" target="rightframe"><i>MovementMethod</i></A><br>
+<!-- Class MultiTapKeyListener -->
+<A HREF="android.text.method.MultiTapKeyListener.html" class="hiddenlink" target="rightframe">MultiTapKeyListener</A><br>
+<!-- Field NETWORK_PREFERENCE -->
+<A NAME="N"></A>
+<br><font size="+2">N</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.NETWORK_PREFERENCE" class="hiddenlink" target="rightframe">NETWORK_PREFERENCE</A>
+</nobr><br>
+<!-- Class NetworkInfo -->
+<A HREF="android.net.NetworkInfo.html" class="hiddenlink" target="rightframe">NetworkInfo</A><br>
+<!-- Field NUM_STREAMS -->
+<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.NUM_STREAMS" class="hiddenlink" target="rightframe">NUM_STREAMS</A>
+</nobr><br>
+<!-- Field numeric -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.numeric" class="hiddenlink" target="rightframe">numeric</A>
+</nobr><br>
+<!-- Method onGlobalFocusChanged -->
+<A NAME="O"></A>
+<br><font size="+2">O</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.webkit.WebView.html#android.webkit.WebView.onGlobalFocusChanged_changed(android.view.View, android.view.View)" class="hiddenlink" target="rightframe">onGlobalFocusChanged
+(<code>View, View</code>)</A></nobr><br>
+<!-- Method onRestoreInstanceState -->
+<nobr><A HREF="android.widget.ProgressBar.html#android.widget.ProgressBar.onRestoreInstanceState_changed(android.os.Parcelable)" class="hiddenlink" target="rightframe">onRestoreInstanceState
+(<code>Parcelable</code>)</A></nobr><br>
+<!-- Method onSaveInstanceState -->
+<nobr><A HREF="android.widget.ProgressBar.html#android.widget.ProgressBar.onSaveInstanceState_changed()" class="hiddenlink" target="rightframe">onSaveInstanceState
+()</A></nobr><br>
+<!-- Class OrientationListener -->
+<A HREF="android.view.OrientationListener.html" class="hiddenlink" target="rightframe">OrientationListener</A><br>
+<!-- Class Pack200.Packer -->
+<A NAME="P"></A>
+<br><font size="+2">P</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="java.util.jar.Pack200.Packer.html" class="hiddenlink" target="rightframe"><i>Pack200.Packer</i></A><br>
+<!-- Class Pack200.Unpacker -->
+<A HREF="java.util.jar.Pack200.Unpacker.html" class="hiddenlink" target="rightframe"><i>Pack200.Unpacker</i></A><br>
+<!-- Class PackageInfo -->
+<A HREF="android.content.pm.PackageInfo.html" class="hiddenlink" target="rightframe">PackageInfo</A><br>
+<!-- Class PackageManager -->
+<A HREF="android.content.pm.PackageManager.html" class="hiddenlink" target="rightframe">PackageManager</A><br>
+<!-- Class Parcel -->
+<A HREF="android.os.Parcel.html" class="hiddenlink" target="rightframe">Parcel</A><br>
+<!-- Class ParcelFileDescriptor -->
+<A HREF="android.os.ParcelFileDescriptor.html" class="hiddenlink" target="rightframe">ParcelFileDescriptor</A><br>
+<!-- Field PARENTAL_CONTROL_ENABLED -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.PARENTAL_CONTROL_ENABLED" class="hiddenlink" target="rightframe">PARENTAL_CONTROL_ENABLED</A>
+</nobr><br>
+<!-- Field PARENTAL_CONTROL_LAST_UPDATE -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.PARENTAL_CONTROL_LAST_UPDATE" class="hiddenlink" target="rightframe">PARENTAL_CONTROL_LAST_UPDATE</A>
+</nobr><br>
+<!-- Field PARENTAL_CONTROL_REDIRECT_URL -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.PARENTAL_CONTROL_REDIRECT_URL" class="hiddenlink" target="rightframe">PARENTAL_CONTROL_REDIRECT_URL</A>
+</nobr><br>
+<!-- Method parse -->
+<nobr><A HREF="java.util.logging.Level.html#java.util.logging.Level.parse_changed(java.lang.String)" class="hiddenlink" target="rightframe">parse
+(<code>String</code>)</A></nobr><br>
+<!-- Field password -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.password" class="hiddenlink" target="rightframe">password</A>
+</nobr><br>
+<!-- Class PendingIntent -->
+<A HREF="android.app.PendingIntent.html" class="hiddenlink" target="rightframe">PendingIntent</A><br>
+<!-- Field phoneNumber -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.phoneNumber" class="hiddenlink" target="rightframe">phoneNumber</A>
+</nobr><br>
+<!-- Class PhoneNumberUtils -->
+<A HREF="android.telephony.PhoneNumberUtils.html" class="hiddenlink" target="rightframe">PhoneNumberUtils</A><br>
+<!-- Method playSoundEffect -->
+<nobr><A HREF="android.view.View.html#android.view.View.playSoundEffect_changed(int)" class="hiddenlink" target="rightframe">playSoundEffect
+(<code>int</code>)</A></nobr><br>
+<!-- Class PopupWindow -->
+<A HREF="android.widget.PopupWindow.html" class="hiddenlink" target="rightframe">PopupWindow</A><br>
+<!-- Class PopupWindow.OnDismissListener -->
+<A HREF="android.widget.PopupWindow.OnDismissListener.html" class="hiddenlink" target="rightframe"><i>PopupWindow.OnDismissListener</i></A><br>
+<!-- Method prepare -->
+<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.prepare_changed()" class="hiddenlink" target="rightframe">prepare
+()</A></nobr><br>
+<!-- Class ProgressBar -->
+<A HREF="android.widget.ProgressBar.html" class="hiddenlink" target="rightframe">ProgressBar</A><br>
+<!-- Class ProviderTestCase -->
+<A HREF="android.test.ProviderTestCase.html" class="hiddenlink" target="rightframe">ProviderTestCase</A><br>
+<!-- Class Proxy -->
+<A HREF="java.lang.reflect.Proxy.html" class="hiddenlink" target="rightframe">Proxy</A><br>
+<!-- Class QuoteSpan -->
+<A NAME="Q"></A>
+<br><font size="+2">Q</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.text.style.QuoteSpan.html" class="hiddenlink" target="rightframe">QuoteSpan</A><br>
+<!-- Class QwertyKeyListener -->
+<A HREF="android.text.method.QwertyKeyListener.html" class="hiddenlink" target="rightframe">QwertyKeyListener</A><br>
+<!-- Class R.attr -->
+<A NAME="R"></A>
+<br><font size="+2">R</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.R.attr.html" class="hiddenlink" target="rightframe">R.attr</A><br>
+<!-- Class R.drawable -->
+<A HREF="android.R.drawable.html" class="hiddenlink" target="rightframe">R.drawable</A><br>
+<!-- Class R.id -->
+<A HREF="android.R.id.html" class="hiddenlink" target="rightframe">R.id</A><br>
+<!-- Class R.string -->
+<A HREF="android.R.string.html" class="hiddenlink" target="rightframe">R.string</A><br>
+<!-- Class R.style -->
+<A HREF="android.R.style.html" class="hiddenlink" target="rightframe">R.style</A><br>
+<!-- Class RasterizerSpan -->
+<A HREF="android.text.style.RasterizerSpan.html" class="hiddenlink" target="rightframe">RasterizerSpan</A><br>
+<!-- Field RAW_DATA_INDEX -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.RAW_DATA_INDEX" class="hiddenlink" target="rightframe">RAW_DATA_INDEX</A>
+</nobr><br>
+<!-- Field RAW_DATA_X -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.RAW_DATA_X" class="hiddenlink" target="rightframe">RAW_DATA_X</A>
+</nobr><br>
+<!-- Field RAW_DATA_Y -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.RAW_DATA_Y" class="hiddenlink" target="rightframe">RAW_DATA_Y</A>
+</nobr><br>
+<!-- Field RAW_DATA_Z -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.RAW_DATA_Z" class="hiddenlink" target="rightframe">RAW_DATA_Z</A>
+</nobr><br>
+<!-- Method readHashMap -->
+<nobr><A HREF="android.os.Parcel.html#android.os.Parcel.readHashMap_changed(java.lang.ClassLoader)" class="hiddenlink" target="rightframe">readHashMap
+(<code>ClassLoader</code>)</A></nobr><br>
+<!-- Method readMap -->
+<nobr><A HREF="android.os.Parcel.html#android.os.Parcel.readMap_changed(java.util.Map, java.lang.ClassLoader)" class="hiddenlink" target="rightframe">readMap
+(<code>Map, ClassLoader</code>)</A></nobr><br>
+<!-- Class Rect -->
+<A HREF="android.graphics.Rect.html" class="hiddenlink" target="rightframe">Rect</A><br>
+<!-- Class RectF -->
+<A HREF="android.graphics.RectF.html" class="hiddenlink" target="rightframe">RectF</A><br>
+<!-- Method registerListener -->
+<i>registerListener</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.registerListener_changed(android.hardware.SensorListener, int)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>SensorListener, int</code>)&nbsp;in&nbsp;android.hardware.SensorManager
+</A></nobr><br>
+<!-- Method registerListener -->
+&nbsp;&nbsp;<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.registerListener_changed(android.hardware.SensorListener, int, int)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>SensorListener, int, int</code>)&nbsp;in&nbsp;android.hardware.SensorManager
+</A></nobr><br>
+<!-- Class RelativeSizeSpan -->
+<A HREF="android.text.style.RelativeSizeSpan.html" class="hiddenlink" target="rightframe">RelativeSizeSpan</A><br>
+<!-- Class RemoteViews -->
+<A HREF="android.widget.RemoteViews.html" class="hiddenlink" target="rightframe">RemoteViews</A><br>
+<!-- Class RemoteViews.ActionException -->
+<A HREF="android.widget.RemoteViews.ActionException.html" class="hiddenlink" target="rightframe">RemoteViews.ActionException</A><br>
+<!-- Class ResourceCursorAdapter -->
+<A HREF="android.widget.ResourceCursorAdapter.html" class="hiddenlink" target="rightframe">ResourceCursorAdapter</A><br>
+<!-- Class Resources -->
+<A HREF="android.content.res.Resources.html" class="hiddenlink" target="rightframe">Resources</A><br>
+<!-- Class RingtoneManager -->
+<A HREF="android.media.RingtoneManager.html" class="hiddenlink" target="rightframe">RingtoneManager</A><br>
+<!-- Class RotateDrawable -->
+<A HREF="android.graphics.drawable.RotateDrawable.html" class="hiddenlink" target="rightframe">RotateDrawable</A><br>
+<!-- Field ROUTE_BLUETOOTH -->
+<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.ROUTE_BLUETOOTH" class="hiddenlink" target="rightframe">ROUTE_BLUETOOTH</A>
+</nobr><br>
+<!-- Class ScaleDrawable -->
+<A NAME="S"></A>
+<br><font size="+2">S</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.graphics.drawable.ScaleDrawable.html" class="hiddenlink" target="rightframe">ScaleDrawable</A><br>
+<!-- Class ScaleXSpan -->
+<A HREF="android.text.style.ScaleXSpan.html" class="hiddenlink" target="rightframe">ScaleXSpan</A><br>
+<!-- Class Scroller -->
+<A HREF="android.widget.Scroller.html" class="hiddenlink" target="rightframe">Scroller</A><br>
+<!-- Class ScrollingMovementMethod -->
+<A HREF="android.text.method.ScrollingMovementMethod.html" class="hiddenlink" target="rightframe">ScrollingMovementMethod</A><br>
+<!-- Method scrollToBottom -->
+<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.scrollToBottom_changed(android.test.ActivityInstrumentationTestCase, android.view.ViewGroup)" class="hiddenlink" target="rightframe">scrollToBottom
+(<code>ActivityInstrumentationTestCase, ViewGroup</code>)</A></nobr><br>
+<!-- Method scrollToTop -->
+<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.scrollToTop_changed(android.test.ActivityInstrumentationTestCase, android.view.ViewGroup)" class="hiddenlink" target="rightframe">scrollToTop
+(<code>ActivityInstrumentationTestCase, ViewGroup</code>)</A></nobr><br>
+<!-- Field searchButtonText -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.searchButtonText" class="hiddenlink" target="rightframe">searchButtonText</A>
+</nobr><br>
+<!-- Field SENSOR_ACCELEROMETER -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.SENSOR_ACCELEROMETER" class="hiddenlink" target="rightframe">SENSOR_ACCELEROMETER</A>
+</nobr><br>
+<!-- Field SENSOR_ALL -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.SENSOR_ALL" class="hiddenlink" target="rightframe">SENSOR_ALL</A>
+</nobr><br>
+<!-- Field SENSOR_LIGHT -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.SENSOR_LIGHT" class="hiddenlink" target="rightframe">SENSOR_LIGHT</A>
+</nobr><br>
+<!-- Field SENSOR_MAGNETIC_FIELD -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.SENSOR_MAGNETIC_FIELD" class="hiddenlink" target="rightframe">SENSOR_MAGNETIC_FIELD</A>
+</nobr><br>
+<!-- Field SENSOR_MAX -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.SENSOR_MAX" class="hiddenlink" target="rightframe">SENSOR_MAX</A>
+</nobr><br>
+<!-- Field SENSOR_MIN -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.SENSOR_MIN" class="hiddenlink" target="rightframe">SENSOR_MIN</A>
+</nobr><br>
+<!-- Field SENSOR_ORIENTATION -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.SENSOR_ORIENTATION" class="hiddenlink" target="rightframe">SENSOR_ORIENTATION</A>
+</nobr><br>
+<!-- Field SENSOR_ORIENTATION_RAW -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.SENSOR_ORIENTATION_RAW" class="hiddenlink" target="rightframe">SENSOR_ORIENTATION_RAW</A>
+</nobr><br>
+<!-- Field SENSOR_PROXIMITY -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.SENSOR_PROXIMITY" class="hiddenlink" target="rightframe">SENSOR_PROXIMITY</A>
+</nobr><br>
+<!-- Field SENSOR_TEMPERATURE -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.SENSOR_TEMPERATURE" class="hiddenlink" target="rightframe">SENSOR_TEMPERATURE</A>
+</nobr><br>
+<!-- Field SENSOR_TRICORDER -->
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.SENSOR_TRICORDER" class="hiddenlink" target="rightframe">SENSOR_TRICORDER</A>
+</nobr><br>
+<!-- Class SensorListener -->
+<A HREF="android.hardware.SensorListener.html" class="hiddenlink" target="rightframe"><i>SensorListener</i></A><br>
+<!-- Class SensorManager -->
+<A HREF="android.hardware.SensorManager.html" class="hiddenlink" target="rightframe">SensorManager</A><br>
+<!-- Method service -->
+<nobr><A HREF="android.webkit.UrlInterceptHandler.html#android.webkit.UrlInterceptHandler.service_changed(java.lang.String, java.util.Map<java.lang.String, java.lang.String>)" class="hiddenlink" target="rightframe">service
+(<code>String, Map&lt;String, String&gt;</code>)</A></nobr><br>
+<!-- Method setButton -->
+<i>setButton</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.app.AlertDialog.html#android.app.AlertDialog.setButton_changed(int, java.lang.CharSequence, android.content.DialogInterface.OnClickListener)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>int, CharSequence, OnClickListener</code>)&nbsp;in&nbsp;android.app.AlertDialog
+</A></nobr><br>
+<!-- Method setButton -->
+&nbsp;&nbsp;<nobr><A HREF="android.app.AlertDialog.html#android.app.AlertDialog.setButton_changed(int, java.lang.CharSequence, android.os.Message)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>int, CharSequence, Message</code>)&nbsp;in&nbsp;android.app.AlertDialog
+</A></nobr><br>
+<!-- Method setButton2 -->
+<i>setButton2</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.app.AlertDialog.html#android.app.AlertDialog.setButton2_changed(java.lang.CharSequence, android.content.DialogInterface.OnClickListener)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>CharSequence, OnClickListener</code>)&nbsp;in&nbsp;android.app.AlertDialog
+</A></nobr><br>
+<!-- Method setButton2 -->
+&nbsp;&nbsp;<nobr><A HREF="android.app.AlertDialog.html#android.app.AlertDialog.setButton2_changed(java.lang.CharSequence, android.os.Message)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>CharSequence, Message</code>)&nbsp;in&nbsp;android.app.AlertDialog
+</A></nobr><br>
+<!-- Method setButton3 -->
+<i>setButton3</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.app.AlertDialog.html#android.app.AlertDialog.setButton3_changed(java.lang.CharSequence, android.content.DialogInterface.OnClickListener)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>CharSequence, OnClickListener</code>)&nbsp;in&nbsp;android.app.AlertDialog
+</A></nobr><br>
+<!-- Method setButton3 -->
+&nbsp;&nbsp;<nobr><A HREF="android.app.AlertDialog.html#android.app.AlertDialog.setButton3_changed(java.lang.CharSequence, android.os.Message)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>CharSequence, Message</code>)&nbsp;in&nbsp;android.app.AlertDialog
+</A></nobr><br>
+<!-- Method setPreviewDisplay -->
+<nobr><A HREF="android.hardware.Camera.html#android.hardware.Camera.setPreviewDisplay_changed(android.view.SurfaceHolder)" class="hiddenlink" target="rightframe">setPreviewDisplay
+(<code>SurfaceHolder</code>)</A></nobr><br>
+<!-- Class Settings -->
+<A HREF="android.provider.Settings.html" class="hiddenlink" target="rightframe">Settings</A><br>
+<!-- Class Settings.System -->
+<A HREF="android.provider.Settings.System.html" class="hiddenlink" target="rightframe">Settings.System</A><br>
+<!-- Field SETTINGS_CLASSNAME -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.SETTINGS_CLASSNAME" class="hiddenlink" target="rightframe">SETTINGS_CLASSNAME</A>
+</nobr><br>
+<!-- Method setUserAgent -->
+<nobr><A HREF="android.webkit.WebSettings.html#android.webkit.WebSettings.setUserAgent_changed(int)" class="hiddenlink" target="rightframe">setUserAgent
+(<code>int</code>)</A></nobr><br>
+<!-- Class Shape -->
+<A HREF="android.graphics.drawable.shapes.Shape.html" class="hiddenlink" target="rightframe">Shape</A><br>
+<!-- Class SimpleCursorAdapter -->
+<A HREF="android.widget.SimpleCursorAdapter.html" class="hiddenlink" target="rightframe">SimpleCursorAdapter</A><br>
+<!-- Field singleLine -->
+<nobr><A HREF="android.R.attr.html#android.R.attr.singleLine" class="hiddenlink" target="rightframe">singleLine</A>
+</nobr><br>
+<!-- Class SmsMessage -->
+<A HREF="android.telephony.gsm.SmsMessage.html" class="hiddenlink" target="rightframe">SmsMessage</A><br>
+<!-- Class Socket -->
+<i>Socket</i><br>
+&nbsp;&nbsp;<A HREF="java.net.Socket.html" class="hiddenlink" target="rightframe">java.net</A><br>
+<!-- Constructor Socket -->
+&nbsp;&nbsp;<nobr><A HREF="java.net.Socket.html#java.net.Socket.ctor_changed()" class="hiddenlink" target="rightframe">Socket
+()</A></nobr>&nbsp;constructor<br>
+<!-- Constructor Socket -->
+&nbsp;&nbsp;<nobr><A HREF="java.net.Socket.html#java.net.Socket.ctor_changed(java.lang.String, int)" class="hiddenlink" target="rightframe">Socket
+(<code>String, int</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Constructor Socket -->
+&nbsp;&nbsp;<nobr><A HREF="java.net.Socket.html#java.net.Socket.ctor_changed(java.lang.String, int, java.net.InetAddress, int)" class="hiddenlink" target="rightframe">Socket
+(<code>String, int, InetAddress, int</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Constructor Socket -->
+&nbsp;&nbsp;<nobr><A HREF="java.net.Socket.html#java.net.Socket.ctor_changed(java.net.Proxy)" class="hiddenlink" target="rightframe">Socket
+(<code>Proxy</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Constructor Socket -->
+&nbsp;&nbsp;<nobr><A HREF="java.net.Socket.html#java.net.Socket.ctor_changed(java.net.SocketImpl)" class="hiddenlink" target="rightframe">Socket
+(<code>SocketImpl</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Class SoundPool -->
+<A HREF="android.media.SoundPool.html" class="hiddenlink" target="rightframe">SoundPool</A><br>
+<!-- Class Spanned -->
+<A HREF="android.text.Spanned.html" class="hiddenlink" target="rightframe"><i>Spanned</i></A><br>
+<!-- Class SpanWatcher -->
+<A HREF="android.text.SpanWatcher.html" class="hiddenlink" target="rightframe"><i>SpanWatcher</i></A><br>
+<!-- Class SparseIntArray -->
+<A HREF="android.util.SparseIntArray.html" class="hiddenlink" target="rightframe">SparseIntArray</A><br>
+<!-- Class SQLiteDatabase -->
+<A HREF="android.database.sqlite.SQLiteDatabase.html" class="hiddenlink" target="rightframe">SQLiteDatabase</A><br>
+<!-- Class StrikethroughSpan -->
+<A HREF="android.text.style.StrikethroughSpan.html" class="hiddenlink" target="rightframe">StrikethroughSpan</A><br>
+<!-- Class String -->
+<i>String</i><br>
+&nbsp;&nbsp;<A HREF="java.lang.String.html" class="hiddenlink" target="rightframe">java.lang</A><br>
+<!-- Constructor String -->
+&nbsp;&nbsp;<nobr><A HREF="java.lang.String.html#java.lang.String.ctor_changed()" class="hiddenlink" target="rightframe">String
+()</A></nobr>&nbsp;constructor<br>
+<!-- Constructor String -->
+&nbsp;&nbsp;<nobr><A HREF="java.lang.String.html#java.lang.String.ctor_changed(byte[])" class="hiddenlink" target="rightframe">String
+(<code>byte[]</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Constructor String -->
+&nbsp;&nbsp;<nobr><A HREF="java.lang.String.html#java.lang.String.ctor_changed(byte[], int)" class="hiddenlink" target="rightframe">String
+(<code>byte[], int</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Constructor String -->
+&nbsp;&nbsp;<nobr><A HREF="java.lang.String.html#java.lang.String.ctor_changed(byte[], int, int)" class="hiddenlink" target="rightframe">String
+(<code>byte[], int, int</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Constructor String -->
+&nbsp;&nbsp;<nobr><A HREF="java.lang.String.html#java.lang.String.ctor_changed(byte[], int, int, int)" class="hiddenlink" target="rightframe">String
+(<code>byte[], int, int, int</code>)</A></nobr>&nbsp;constructor<br>
+<!-- Class StyleSpan -->
+<A HREF="android.text.style.StyleSpan.html" class="hiddenlink" target="rightframe">StyleSpan</A><br>
+<!-- Class SubscriptSpan -->
+<A HREF="android.text.style.SubscriptSpan.html" class="hiddenlink" target="rightframe">SubscriptSpan</A><br>
+<!-- Class SuperscriptSpan -->
+<A HREF="android.text.style.SuperscriptSpan.html" class="hiddenlink" target="rightframe">SuperscriptSpan</A><br>
+<!-- Class TelephonyManager -->
+<A NAME="T"></A>
+<br><font size="+2">T</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.telephony.TelephonyManager.html" class="hiddenlink" target="rightframe">TelephonyManager</A><br>
+<!-- Class TestMethod -->
+<A HREF="android.test.suitebuilder.TestMethod.html" class="hiddenlink" target="rightframe">TestMethod</A><br>
+<!-- Class TestSuiteBuilder -->
+<A HREF="android.test.suitebuilder.TestSuiteBuilder.html" class="hiddenlink" target="rightframe">TestSuiteBuilder</A><br>
+<!-- Class TextAppearanceSpan -->
+<A HREF="android.text.style.TextAppearanceSpan.html" class="hiddenlink" target="rightframe">TextAppearanceSpan</A><br>
+<!-- Class TextKeyListener -->
+<A HREF="android.text.method.TextKeyListener.html" class="hiddenlink" target="rightframe">TextKeyListener</A><br>
+<!-- Class TextUtils -->
+<A HREF="android.text.TextUtils.html" class="hiddenlink" target="rightframe">TextUtils</A><br>
+<!-- Class TextView -->
+<A HREF="android.widget.TextView.html" class="hiddenlink" target="rightframe">TextView</A><br>
+<!-- Class TextWatcher -->
+<A HREF="android.text.TextWatcher.html" class="hiddenlink" target="rightframe"><i>TextWatcher</i></A><br>
+<!-- Class TimeKeyListener -->
+<A HREF="android.text.method.TimeKeyListener.html" class="hiddenlink" target="rightframe">TimeKeyListener</A><br>
+<!-- Class TimeUtils -->
+<A HREF="android.util.TimeUtils.html" class="hiddenlink" target="rightframe">TimeUtils</A><br>
+<!-- Class Touch -->
+<A HREF="android.text.method.Touch.html" class="hiddenlink" target="rightframe">Touch</A><br>
+<!-- Class TouchUtils -->
+<A HREF="android.test.TouchUtils.html" class="hiddenlink" target="rightframe">TouchUtils</A><br>
+<!-- Class Transformation -->
+<A HREF="android.view.animation.Transformation.html" class="hiddenlink" target="rightframe">Transformation</A><br>
+<!-- Class TransitionDrawable -->
+<A HREF="android.graphics.drawable.TransitionDrawable.html" class="hiddenlink" target="rightframe">TransitionDrawable</A><br>
+<!-- Class TypedArray -->
+<A HREF="android.content.res.TypedArray.html" class="hiddenlink" target="rightframe">TypedArray</A><br>
+<!-- Class TypefaceSpan -->
+<A HREF="android.text.style.TypefaceSpan.html" class="hiddenlink" target="rightframe">TypefaceSpan</A><br>
+<!-- Class UnderlineSpan -->
+<A NAME="U"></A>
+<br><font size="+2">U</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.text.style.UnderlineSpan.html" class="hiddenlink" target="rightframe">UnderlineSpan</A><br>
+<!-- Method unregisterListener -->
+<i>unregisterListener</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.unregisterListener_changed(android.hardware.SensorListener)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>SensorListener</code>)&nbsp;in&nbsp;android.hardware.SensorManager
+</A></nobr><br>
+<!-- Method unregisterListener -->
+&nbsp;&nbsp;<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.unregisterListener_changed(android.hardware.SensorListener, int)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>SensorListener, int</code>)&nbsp;in&nbsp;android.hardware.SensorManager
+</A></nobr><br>
+<!-- Class UpdateLayout -->
+<A HREF="android.text.style.UpdateLayout.html" class="hiddenlink" target="rightframe"><i>UpdateLayout</i></A><br>
+<!-- Class UrlInterceptHandler -->
+<A HREF="android.webkit.UrlInterceptHandler.html" class="hiddenlink" target="rightframe"><i>UrlInterceptHandler</i></A><br>
+<!-- Class UrlInterceptRegistry -->
+<A HREF="android.webkit.UrlInterceptRegistry.html" class="hiddenlink" target="rightframe">UrlInterceptRegistry</A><br>
+<!-- Class URLSpan -->
+<A HREF="android.text.style.URLSpan.html" class="hiddenlink" target="rightframe">URLSpan</A><br>
+<!-- Class URLUtil -->
+<A HREF="android.webkit.URLUtil.html" class="hiddenlink" target="rightframe">URLUtil</A><br>
+<!-- Field USB_MASS_STORAGE_ENABLED -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.USB_MASS_STORAGE_ENABLED" class="hiddenlink" target="rightframe">USB_MASS_STORAGE_ENABLED</A>
+</nobr><br>
+<!-- Field USE_GOOGLE_MAIL -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.USE_GOOGLE_MAIL" class="hiddenlink" target="rightframe">USE_GOOGLE_MAIL</A>
+</nobr><br>
+<!-- Class View -->
+<A NAME="V"></A>
+<br><font size="+2">V</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.view.View.html" class="hiddenlink" target="rightframe">View</A><br>
+<!-- Class ViewConfiguration -->
+<i>ViewConfiguration</i><br>
+&nbsp;&nbsp;<A HREF="android.view.ViewConfiguration.html" class="hiddenlink" target="rightframe">android.view</A><br>
+<!-- Constructor ViewConfiguration -->
+&nbsp;&nbsp;<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.ctor_changed()" class="hiddenlink" target="rightframe">ViewConfiguration
+()</A></nobr>&nbsp;constructor<br>
+<!-- Class ViewDebug -->
+<A HREF="android.view.ViewDebug.html" class="hiddenlink" target="rightframe">ViewDebug</A><br>
+<!-- Class ViewGroup -->
+<A HREF="android.view.ViewGroup.html" class="hiddenlink" target="rightframe">ViewGroup</A><br>
+<!-- Class ViewParent -->
+<A HREF="android.view.ViewParent.html" class="hiddenlink" target="rightframe"><i>ViewParent</i></A><br>
+<!-- Class ViewTreeObserver -->
+<A HREF="android.view.ViewTreeObserver.html" class="hiddenlink" target="rightframe">ViewTreeObserver</A><br>
+<!-- Class VMDebug -->
+<A HREF="dalvik.system.VMDebug.html" class="hiddenlink" target="rightframe">VMDebug</A><br>
+<!-- Class WebHistoryItem -->
+<A NAME="W"></A>
+<br><font size="+2">W</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.webkit.WebHistoryItem.html" class="hiddenlink" target="rightframe">WebHistoryItem</A><br>
+<!-- Class WebSettings -->
+<A HREF="android.webkit.WebSettings.html" class="hiddenlink" target="rightframe">WebSettings</A><br>
+<!-- Class WebView -->
+<A HREF="android.webkit.WebView.html" class="hiddenlink" target="rightframe">WebView</A><br>
+<!-- Field WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON" class="hiddenlink" target="rightframe">WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON</A>
+</nobr><br>
+<!-- Field WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY" class="hiddenlink" target="rightframe">WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY</A>
+</nobr><br>
+<!-- Field WIFI_NUM_OPEN_NETWORKS_KEPT -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_NUM_OPEN_NETWORKS_KEPT" class="hiddenlink" target="rightframe">WIFI_NUM_OPEN_NETWORKS_KEPT</A>
+</nobr><br>
+<!-- Field WIFI_ON -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_ON" class="hiddenlink" target="rightframe">WIFI_ON</A>
+</nobr><br>
+<!-- Field WIFI_WATCHDOG_ACCEPTABLE_PACKET_LOSS_PERCENTAGE -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_WATCHDOG_ACCEPTABLE_PACKET_LOSS_PERCENTAGE" class="hiddenlink" target="rightframe">WIFI_WATCHDOG_ACCEPTABLE_PACKET_LOSS_PERCENTAGE</A>
+</nobr><br>
+<!-- Field WIFI_WATCHDOG_AP_COUNT -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_WATCHDOG_AP_COUNT" class="hiddenlink" target="rightframe">WIFI_WATCHDOG_AP_COUNT</A>
+</nobr><br>
+<!-- Field WIFI_WATCHDOG_BACKGROUND_CHECK_DELAY_MS -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_WATCHDOG_BACKGROUND_CHECK_DELAY_MS" class="hiddenlink" target="rightframe">WIFI_WATCHDOG_BACKGROUND_CHECK_DELAY_MS</A>
+</nobr><br>
+<!-- Field WIFI_WATCHDOG_BACKGROUND_CHECK_ENABLED -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_WATCHDOG_BACKGROUND_CHECK_ENABLED" class="hiddenlink" target="rightframe">WIFI_WATCHDOG_BACKGROUND_CHECK_ENABLED</A>
+</nobr><br>
+<!-- Field WIFI_WATCHDOG_BACKGROUND_CHECK_TIMEOUT_MS -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_WATCHDOG_BACKGROUND_CHECK_TIMEOUT_MS" class="hiddenlink" target="rightframe">WIFI_WATCHDOG_BACKGROUND_CHECK_TIMEOUT_MS</A>
+</nobr><br>
+<!-- Field WIFI_WATCHDOG_INITIAL_IGNORED_PING_COUNT -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_WATCHDOG_INITIAL_IGNORED_PING_COUNT" class="hiddenlink" target="rightframe">WIFI_WATCHDOG_INITIAL_IGNORED_PING_COUNT</A>
+</nobr><br>
+<!-- Field WIFI_WATCHDOG_MAX_AP_CHECKS -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_WATCHDOG_MAX_AP_CHECKS" class="hiddenlink" target="rightframe">WIFI_WATCHDOG_MAX_AP_CHECKS</A>
+</nobr><br>
+<!-- Field WIFI_WATCHDOG_ON -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_WATCHDOG_ON" class="hiddenlink" target="rightframe">WIFI_WATCHDOG_ON</A>
+</nobr><br>
+<!-- Field WIFI_WATCHDOG_PING_COUNT -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_WATCHDOG_PING_COUNT" class="hiddenlink" target="rightframe">WIFI_WATCHDOG_PING_COUNT</A>
+</nobr><br>
+<!-- Field WIFI_WATCHDOG_PING_DELAY_MS -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_WATCHDOG_PING_DELAY_MS" class="hiddenlink" target="rightframe">WIFI_WATCHDOG_PING_DELAY_MS</A>
+</nobr><br>
+<!-- Field WIFI_WATCHDOG_PING_TIMEOUT_MS -->
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_WATCHDOG_PING_TIMEOUT_MS" class="hiddenlink" target="rightframe">WIFI_WATCHDOG_PING_TIMEOUT_MS</A>
+</nobr><br>
+<!-- Class WifiManager -->
+<A HREF="android.net.wifi.WifiManager.html" class="hiddenlink" target="rightframe">WifiManager</A><br>
+<!-- Class Window -->
+<A HREF="android.view.Window.html" class="hiddenlink" target="rightframe">Window</A><br>
+<!-- Class WindowManager.LayoutParams -->
+<A HREF="android.view.WindowManager.LayoutParams.html" class="hiddenlink" target="rightframe">WindowManager.LayoutParams</A><br>
+<!-- Method writeMap -->
+<nobr><A HREF="android.os.Parcel.html#android.os.Parcel.writeMap_changed(java.util.Map)" class="hiddenlink" target="rightframe">writeMap
+(<code>Map</code>)</A></nobr><br>
+<!-- Method yieldIfContended -->
+<A NAME="Y"></A>
+<br><font size="+2">Y</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.database.sqlite.SQLiteDatabase.html#android.database.sqlite.SQLiteDatabase.yieldIfContended_changed()" class="hiddenlink" target="rightframe">yieldIfContended
+()</A></nobr><br>
+<!-- Class Zygote -->
+<A NAME="Z"></A>
+<br><font size="+2">Z</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="dalvik.system.Zygote.html" class="hiddenlink" target="rightframe">Zygote</A><br>
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/alldiffs_index_removals.html b/docs/html/sdk/api_diff/3/changes/alldiffs_index_removals.html
new file mode 100644
index 000000000000..662b26690d2e
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/alldiffs_index_removals.html
@@ -0,0 +1,78 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+All Removals Index
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY class="gc-documentation">
+<a NAME="topheader"></a>
+<table summary="Index for All Differences" width="100%" class="jdiffIndex" border="0" cellspacing="0" cellpadding="0" style="padding-bottom:0;margin-bottom:0;">
+  <tr>
+  <th class="indexHeader">
+    Filter the Index:
+  </th>
+  </tr>
+  <tr>
+  <td class="indexText" style="line-height:1.3em;padding-left:2em;">
+<a href="alldiffs_index_all.html" xclass="hiddenlink">All Differences</a>
+  <br>
+<b>Removals</b>
+  <br>
+<A HREF="alldiffs_index_additions.html"xclass="hiddenlink">Additions</A>
+  <br>
+<A HREF="alldiffs_index_changes.html"xclass="hiddenlink">Changes</A>
+  </td>
+  </tr>
+</table>
+<div id="indexTableCaption">
+<font size="-2"><strong>Bold</strong>&nbsp;indicates&nbsp;New;&nbsp;<strike>Strike</strike>&nbsp;indicates&nbsp;deleted. Plain indicates changed.</font>
+</div>
+<!-- Field CATEGORY_GADGET -->
+<A NAME="C"></A>
+<br><font size="+2">C</font>&nbsp;
+<a href="#N"><font size="-2">N</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.CATEGORY_GADGET" class="hiddenlink" target="rightframe"><strike>CATEGORY_GADGET</strike></A>
+</nobr><br>
+<!-- Constructor NetworkInfo -->
+<A NAME="N"></A>
+<br><font size="+2">N</font>&nbsp;
+<a href="#C"><font size="-2">C</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.net.NetworkInfo.html#android.net.NetworkInfo.ctor_removed(int)" class="hiddenlink" target="rightframe"><strike>NetworkInfo</strike>
+(<code>int</code>)</A></nobr>&nbsp;constructor<br>
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.Manifest.permission.html b/docs/html/sdk/api_diff/3/changes/android.Manifest.permission.html
new file mode 100644
index 000000000000..76591022179e
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.Manifest.permission.html
@@ -0,0 +1,151 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.Manifest.permission
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.<A HREF="../../../../reference/android/Manifest.permission.html" target="_top"><font size="+3"><tt>Manifest.permission</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<a NAME="fields"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.Manifest.permission.BIND_APPWIDGET"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/Manifest.permission.html#BIND_APPWIDGET" target="_top"><xfont size="+1"><tt>BIND_APPWIDGET</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.Manifest.permission.BIND_INPUT_METHOD"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/Manifest.permission.html#BIND_INPUT_METHOD" target="_top"><xfont size="+1"><tt>BIND_INPUT_METHOD</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.Manifest.permission.MOUNT_FORMAT_FILESYSTEMS"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/Manifest.permission.html#MOUNT_FORMAT_FILESYSTEMS" target="_top"><xfont size="+1"><tt>MOUNT_FORMAT_FILESYSTEMS</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.Manifest.permission.UPDATE_DEVICE_STATS"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/Manifest.permission.html#UPDATE_DEVICE_STATS" target="_top"><xfont size="+1"><tt>UPDATE_DEVICE_STATS</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.Manifest.permission.WRITE_SECURE_SETTINGS"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/Manifest.permission.html#WRITE_SECURE_SETTINGS" target="_top"><xfont size="+1"><tt>WRITE_SECURE_SETTINGS</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.R.attr.html b/docs/html/sdk/api_diff/3/changes/android.R.attr.html
new file mode 100644
index 000000000000..7df16a121329
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.R.attr.html
@@ -0,0 +1,739 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.R.attr
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.<A HREF="../../../../reference/android/R.attr.html" target="_top"><font size="+3"><tt>R.attr</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<a NAME="fields"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.allowSingleTap"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#allowSingleTap" target="_top"><xfont size="+1"><tt>allowSingleTap</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.animateOnClick"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#animateOnClick" target="_top"><xfont size="+1"><tt>animateOnClick</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.backgroundDimEnabled"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#backgroundDimEnabled" target="_top"><xfont size="+1"><tt>backgroundDimEnabled</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.bottomOffset"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#bottomOffset" target="_top"><xfont size="+1"><tt>bottomOffset</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.candidatesTextStyleSpans"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#candidatesTextStyleSpans" target="_top"><xfont size="+1"><tt>candidatesTextStyleSpans</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.codes"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#codes" target="_top"><xfont size="+1"><tt>codes</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.configure"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#configure" target="_top"><xfont size="+1"><tt>configure</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.content"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#content" target="_top"><xfont size="+1"><tt>content</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.dropDownAnchor"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#dropDownAnchor" target="_top"><xfont size="+1"><tt>dropDownAnchor</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.dropDownWidth"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#dropDownWidth" target="_top"><xfont size="+1"><tt>dropDownWidth</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.editorExtras"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#editorExtras" target="_top"><xfont size="+1"><tt>editorExtras</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.fastScrollEnabled"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#fastScrollEnabled" target="_top"><xfont size="+1"><tt>fastScrollEnabled</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.fillEnabled"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#fillEnabled" target="_top"><xfont size="+1"><tt>fillEnabled</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.footerDividersEnabled"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#footerDividersEnabled" target="_top"><xfont size="+1"><tt>footerDividersEnabled</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.handle"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#handle" target="_top"><xfont size="+1"><tt>handle</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.hapticFeedbackEnabled"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#hapticFeedbackEnabled" target="_top"><xfont size="+1"><tt>hapticFeedbackEnabled</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.headerDividersEnabled"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#headerDividersEnabled" target="_top"><xfont size="+1"><tt>headerDividersEnabled</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.horizontalGap"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#horizontalGap" target="_top"><xfont size="+1"><tt>horizontalGap</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.iconPreview"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#iconPreview" target="_top"><xfont size="+1"><tt>iconPreview</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.imeActionId"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#imeActionId" target="_top"><xfont size="+1"><tt>imeActionId</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.imeActionLabel"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#imeActionLabel" target="_top"><xfont size="+1"><tt>imeActionLabel</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.imeExtractEnterAnimation"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#imeExtractEnterAnimation" target="_top"><xfont size="+1"><tt>imeExtractEnterAnimation</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.imeExtractExitAnimation"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#imeExtractExitAnimation" target="_top"><xfont size="+1"><tt>imeExtractExitAnimation</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.imeFullscreenBackground"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#imeFullscreenBackground" target="_top"><xfont size="+1"><tt>imeFullscreenBackground</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.imeOptions"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#imeOptions" target="_top"><xfont size="+1"><tt>imeOptions</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.initialLayout"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#initialLayout" target="_top"><xfont size="+1"><tt>initialLayout</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.innerRadius"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#innerRadius" target="_top"><xfont size="+1"><tt>innerRadius</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.inputType"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#inputType" target="_top"><xfont size="+1"><tt>inputType</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.isDefault"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#isDefault" target="_top"><xfont size="+1"><tt>isDefault</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.isModifier"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#isModifier" target="_top"><xfont size="+1"><tt>isModifier</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.isRepeatable"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#isRepeatable" target="_top"><xfont size="+1"><tt>isRepeatable</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.isScrollContainer"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#isScrollContainer" target="_top"><xfont size="+1"><tt>isScrollContainer</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.isSticky"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#isSticky" target="_top"><xfont size="+1"><tt>isSticky</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.keyBackground"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#keyBackground" target="_top"><xfont size="+1"><tt>keyBackground</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.keyEdgeFlags"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#keyEdgeFlags" target="_top"><xfont size="+1"><tt>keyEdgeFlags</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.keyHeight"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#keyHeight" target="_top"><xfont size="+1"><tt>keyHeight</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.keyIcon"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#keyIcon" target="_top"><xfont size="+1"><tt>keyIcon</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.keyLabel"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#keyLabel" target="_top"><xfont size="+1"><tt>keyLabel</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.keyOutputText"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#keyOutputText" target="_top"><xfont size="+1"><tt>keyOutputText</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.keyPreviewHeight"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#keyPreviewHeight" target="_top"><xfont size="+1"><tt>keyPreviewHeight</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.keyPreviewLayout"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#keyPreviewLayout" target="_top"><xfont size="+1"><tt>keyPreviewLayout</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.keyPreviewOffset"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#keyPreviewOffset" target="_top"><xfont size="+1"><tt>keyPreviewOffset</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.keyTextColor"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#keyTextColor" target="_top"><xfont size="+1"><tt>keyTextColor</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.keyTextSize"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#keyTextSize" target="_top"><xfont size="+1"><tt>keyTextSize</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.keyWidth"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#keyWidth" target="_top"><xfont size="+1"><tt>keyWidth</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.keyboardMode"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#keyboardMode" target="_top"><xfont size="+1"><tt>keyboardMode</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.labelTextSize"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#labelTextSize" target="_top"><xfont size="+1"><tt>labelTextSize</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.noHistory"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#noHistory" target="_top"><xfont size="+1"><tt>noHistory</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.popupCharacters"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#popupCharacters" target="_top"><xfont size="+1"><tt>popupCharacters</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.popupKeyboard"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#popupKeyboard" target="_top"><xfont size="+1"><tt>popupKeyboard</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.popupLayout"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#popupLayout" target="_top"><xfont size="+1"><tt>popupLayout</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.privateImeOptions"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#privateImeOptions" target="_top"><xfont size="+1"><tt>privateImeOptions</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.reqFiveWayNav"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#reqFiveWayNav" target="_top"><xfont size="+1"><tt>reqFiveWayNav</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.reqHardKeyboard"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#reqHardKeyboard" target="_top"><xfont size="+1"><tt>reqHardKeyboard</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.reqKeyboardType"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#reqKeyboardType" target="_top"><xfont size="+1"><tt>reqKeyboardType</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.reqNavigation"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#reqNavigation" target="_top"><xfont size="+1"><tt>reqNavigation</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.reqTouchScreen"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#reqTouchScreen" target="_top"><xfont size="+1"><tt>reqTouchScreen</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.rowEdgeFlags"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#rowEdgeFlags" target="_top"><xfont size="+1"><tt>rowEdgeFlags</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.settingsActivity"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#settingsActivity" target="_top"><xfont size="+1"><tt>settingsActivity</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.sharedUserLabel"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#sharedUserLabel" target="_top"><xfont size="+1"><tt>sharedUserLabel</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.smoothScrollbar"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#smoothScrollbar" target="_top"><xfont size="+1"><tt>smoothScrollbar</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.state_long_pressable"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#state_long_pressable" target="_top"><xfont size="+1"><tt>state_long_pressable</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.thickness"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#thickness" target="_top"><xfont size="+1"><tt>thickness</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.topOffset"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#topOffset" target="_top"><xfont size="+1"><tt>topOffset</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.updatePeriodMillis"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#updatePeriodMillis" target="_top"><xfont size="+1"><tt>updatePeriodMillis</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.verticalCorrection"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#verticalCorrection" target="_top"><xfont size="+1"><tt>verticalCorrection</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.verticalGap"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#verticalGap" target="_top"><xfont size="+1"><tt>verticalGap</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.voiceLanguage"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#voiceLanguage" target="_top"><xfont size="+1"><tt>voiceLanguage</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.voiceLanguageModel"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#voiceLanguageModel" target="_top"><xfont size="+1"><tt>voiceLanguageModel</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.voiceMaxResults"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#voiceMaxResults" target="_top"><xfont size="+1"><tt>voiceMaxResults</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.voicePromptText"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#voicePromptText" target="_top"><xfont size="+1"><tt>voicePromptText</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.voiceSearchMode"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#voiceSearchMode" target="_top"><xfont size="+1"><tt>voiceSearchMode</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.windowDisablePreview"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#windowDisablePreview" target="_top"><xfont size="+1"><tt>windowDisablePreview</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.windowNoDisplay"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#windowNoDisplay" target="_top"><xfont size="+1"><tt>windowNoDisplay</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.windowSoftInputMode"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#windowSoftInputMode" target="_top"><xfont size="+1"><tt>windowSoftInputMode</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=3>Changed Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.autoText"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#autoText" target="_top"><xfont size="+1"><tt>autoText</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.capitalize"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#capitalize" target="_top"><xfont size="+1"><tt>capitalize</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.editable"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#editable" target="_top"><xfont size="+1"><tt>editable</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.enabled"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#enabled" target="_top"><xfont size="+1"><tt>enabled</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.inputMethod"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#inputMethod" target="_top"><xfont size="+1"><tt>inputMethod</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.numeric"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#numeric" target="_top"><xfont size="+1"><tt>numeric</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.password"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#password" target="_top"><xfont size="+1"><tt>password</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.phoneNumber"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#phoneNumber" target="_top"><xfont size="+1"><tt>phoneNumber</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.searchButtonText"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#searchButtonText" target="_top"><xfont size="+1"><tt>searchButtonText</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.attr.singleLine"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#singleLine" target="_top"><xfont size="+1"><tt>singleLine</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.R.drawable.html b/docs/html/sdk/api_diff/3/changes/android.R.drawable.html
new file mode 100644
index 000000000000..fe046dd7370f
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.R.drawable.html
@@ -0,0 +1,137 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.R.drawable
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.<A HREF="../../../../reference/android/R.drawable.html" target="_top"><font size="+3"><tt>R.drawable</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<a NAME="fields"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.drawable.dark_header"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.drawable.html#dark_header" target="_top"><xfont size="+1"><tt>dark_header</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.drawable.ic_btn_speak_now"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.drawable.html#ic_btn_speak_now" target="_top"><xfont size="+1"><tt>ic_btn_speak_now</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.drawable.title_bar_tall"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.drawable.html#title_bar_tall" target="_top"><xfont size="+1"><tt>title_bar_tall</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.R.id.html b/docs/html/sdk/api_diff/3/changes/android.R.id.html
new file mode 100644
index 000000000000..d30fc1da3b7f
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.R.id.html
@@ -0,0 +1,221 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.R.id
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.<A HREF="../../../../reference/android/R.id.html" target="_top"><font size="+3"><tt>R.id</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<a NAME="fields"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.id.addToDictionary"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.id.html#addToDictionary" target="_top"><xfont size="+1"><tt>addToDictionary</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.id.candidatesArea"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.id.html#candidatesArea" target="_top"><xfont size="+1"><tt>candidatesArea</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.id.closeButton"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.id.html#closeButton" target="_top"><xfont size="+1"><tt>closeButton</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.id.copy"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.id.html#copy" target="_top"><xfont size="+1"><tt>copy</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.id.copyUrl"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.id.html#copyUrl" target="_top"><xfont size="+1"><tt>copyUrl</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.id.cut"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.id.html#cut" target="_top"><xfont size="+1"><tt>cut</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.id.extractArea"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.id.html#extractArea" target="_top"><xfont size="+1"><tt>extractArea</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.id.inputArea"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.id.html#inputArea" target="_top"><xfont size="+1"><tt>inputArea</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.id.inputExtractEditText"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.id.html#inputExtractEditText" target="_top"><xfont size="+1"><tt>inputExtractEditText</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.id.keyboardView"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.id.html#keyboardView" target="_top"><xfont size="+1"><tt>keyboardView</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.id.paste"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.id.html#paste" target="_top"><xfont size="+1"><tt>paste</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.id.selectAll"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.id.html#selectAll" target="_top"><xfont size="+1"><tt>selectAll</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.id.startSelectingText"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.id.html#startSelectingText" target="_top"><xfont size="+1"><tt>startSelectingText</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.id.stopSelectingText"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.id.html#stopSelectingText" target="_top"><xfont size="+1"><tt>stopSelectingText</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.id.switchInputMethod"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.id.html#switchInputMethod" target="_top"><xfont size="+1"><tt>switchInputMethod</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.R.string.html b/docs/html/sdk/api_diff/3/changes/android.R.string.html
new file mode 100644
index 000000000000..5d18ffa187c6
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.R.string.html
@@ -0,0 +1,130 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.R.string
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.<A HREF="../../../../reference/android/R.string.html" target="_top"><font size="+3"><tt>R.string</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<a NAME="fields"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.string.VideoView_error_text_invalid_progressive_playback"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.string.html#VideoView_error_text_invalid_progressive_playback" target="_top"><xfont size="+1"><tt>VideoView_error_text_invalid_progressive_playback</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.string.dialog_alert_title"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.string.html#dialog_alert_title" target="_top"><xfont size="+1"><tt>dialog_alert_title</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.R.style.html b/docs/html/sdk/api_diff/3/changes/android.R.style.html
new file mode 100644
index 000000000000..726bab9fb2b4
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.R.style.html
@@ -0,0 +1,151 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.R.style
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.<A HREF="../../../../reference/android/R.style.html" target="_top"><font size="+3"><tt>R.style</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<a NAME="fields"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.style.Theme_InputMethod"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.style.html#Theme_InputMethod" target="_top"><xfont size="+1"><tt>Theme_InputMethod</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.style.Theme_Light_Panel"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.style.html#Theme_Light_Panel" target="_top"><xfont size="+1"><tt>Theme_Light_Panel</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.style.Theme_NoDisplay"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.style.html#Theme_NoDisplay" target="_top"><xfont size="+1"><tt>Theme_NoDisplay</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.style.Theme_Panel"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.style.html#Theme_Panel" target="_top"><xfont size="+1"><tt>Theme_Panel</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.R.style.Widget_KeyboardView"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.style.html#Widget_KeyboardView" target="_top"><xfont size="+1"><tt>Widget_KeyboardView</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.app.Activity.html b/docs/html/sdk/api_diff/3/changes/android.app.Activity.html
new file mode 100644
index 000000000000..7ff5871e76ce
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.app.Activity.html
@@ -0,0 +1,151 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.app.Activity
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.app.<A HREF="../../../../reference/android/app/Activity.html" target="_top"><font size="+3"><tt>Activity</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.app.Activity.closeContextMenu_added()"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/app/Activity.html#closeContextMenu()" target="_top"><xfont size="+1"><tt>closeContextMenu</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.app.Activity.hasWindowFocus_added()"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/app/Activity.html#hasWindowFocus()" target="_top"><xfont size="+1"><tt>hasWindowFocus</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.app.Activity.onUserInteraction_added()"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/app/Activity.html#onUserInteraction()" target="_top"><xfont size="+1"><tt>onUserInteraction</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.app.Activity.onUserLeaveHint_added()"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/app/Activity.html#onUserLeaveHint()" target="_top"><xfont size="+1"><tt>onUserLeaveHint</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.app.Activity.setVisible_added(boolean)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/app/Activity.html#setVisible(boolean)" target="_top"><xfont size="+1"><tt>setVisible</tt></font></A>(<code>boolean</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.app.ActivityManager.html b/docs/html/sdk/api_diff/3/changes/android.app.ActivityManager.html
new file mode 100644
index 000000000000..bd473fb8a393
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.app.ActivityManager.html
@@ -0,0 +1,137 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.app.ActivityManager
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.app.<A HREF="../../../../reference/android/app/ActivityManager.html" target="_top"><font size="+3"><tt>ActivityManager</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.app.ActivityManager.getDeviceConfigurationInfo_added()"></A>
+  <nobr><code>ConfigurationInfo</code>&nbsp;<A HREF="../../../../reference/android/app/ActivityManager.html#getDeviceConfigurationInfo()" target="_top"><xfont size="+1"><tt>getDeviceConfigurationInfo</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.app.ActivityManager.getRunningAppProcesses_added()"></A>
+  <nobr><code>List&lt;RunningAppProcessInfo&gt;</code>&nbsp;<A HREF="../../../../reference/android/app/ActivityManager.html#getRunningAppProcesses()" target="_top"><xfont size="+1"><tt>getRunningAppProcesses</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.app.ActivityManager.restartPackage_added(java.lang.String)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/app/ActivityManager.html#restartPackage(java.lang.String)" target="_top"><xfont size="+1"><tt>restartPackage</tt></font></A>(<code>String</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.app.AlarmManager.html b/docs/html/sdk/api_diff/3/changes/android.app.AlarmManager.html
new file mode 100644
index 000000000000..b8280f2fc9b6
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.app.AlarmManager.html
@@ -0,0 +1,166 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.app.AlarmManager
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.app.<A HREF="../../../../reference/android/app/AlarmManager.html" target="_top"><font size="+3"><tt>AlarmManager</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.app.AlarmManager.setInexactRepeating_added(int, long, long, android.app.PendingIntent)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/app/AlarmManager.html#setInexactRepeating(int, long, long, android.app.PendingIntent)" target="_top"><xfont size="+1"><tt>setInexactRepeating</tt></font></A>(<code>int,</nobr> long<nobr>,</nobr> long<nobr>,</nobr> PendingIntent<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.app.AlarmManager.INTERVAL_DAY"></A>
+  <nobr><code>long</code>&nbsp;<A HREF="../../../../reference/android/app/AlarmManager.html#INTERVAL_DAY" target="_top"><xfont size="+1"><tt>INTERVAL_DAY</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.app.AlarmManager.INTERVAL_FIFTEEN_MINUTES"></A>
+  <nobr><code>long</code>&nbsp;<A HREF="../../../../reference/android/app/AlarmManager.html#INTERVAL_FIFTEEN_MINUTES" target="_top"><xfont size="+1"><tt>INTERVAL_FIFTEEN_MINUTES</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.app.AlarmManager.INTERVAL_HALF_DAY"></A>
+  <nobr><code>long</code>&nbsp;<A HREF="../../../../reference/android/app/AlarmManager.html#INTERVAL_HALF_DAY" target="_top"><xfont size="+1"><tt>INTERVAL_HALF_DAY</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.app.AlarmManager.INTERVAL_HALF_HOUR"></A>
+  <nobr><code>long</code>&nbsp;<A HREF="../../../../reference/android/app/AlarmManager.html#INTERVAL_HALF_HOUR" target="_top"><xfont size="+1"><tt>INTERVAL_HALF_HOUR</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.app.AlarmManager.INTERVAL_HOUR"></A>
+  <nobr><code>long</code>&nbsp;<A HREF="../../../../reference/android/app/AlarmManager.html#INTERVAL_HOUR" target="_top"><xfont size="+1"><tt>INTERVAL_HOUR</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.app.AlertDialog.html b/docs/html/sdk/api_diff/3/changes/android.app.AlertDialog.html
new file mode 100644
index 000000000000..bb8cdb1624fe
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.app.AlertDialog.html
@@ -0,0 +1,219 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.app.AlertDialog
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.app.<A HREF="../../../../reference/android/app/AlertDialog.html" target="_top"><font size="+3"><tt>AlertDialog</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.app.AlertDialog.getButton_added(int)"></A>
+  <nobr><code>Button</code>&nbsp;<A HREF="../../../../reference/android/app/AlertDialog.html#getButton(int)" target="_top"><xfont size="+1"><tt>getButton</tt></font></A>(<code>int</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.app.AlertDialog.getListView_added()"></A>
+  <nobr><code>ListView</code>&nbsp;<A HREF="../../../../reference/android/app/AlertDialog.html#getListView()" target="_top"><xfont size="+1"><tt>getListView</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.app.AlertDialog.setButton_added(java.lang.CharSequence, android.content.DialogInterface.OnClickListener)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/app/AlertDialog.html#setButton(java.lang.CharSequence, android.content.DialogInterface.OnClickListener)" target="_top"><xfont size="+1"><tt>setButton</tt></font></A>(<code>CharSequence,</nobr> OnClickListener<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.app.AlertDialog.setButton_added(java.lang.CharSequence, android.os.Message)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/app/AlertDialog.html#setButton(java.lang.CharSequence, android.os.Message)" target="_top"><xfont size="+1"><tt>setButton</tt></font></A>(<code>CharSequence,</nobr> Message<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.app.AlertDialog.setView_added(android.view.View, int, int, int, int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/app/AlertDialog.html#setView(android.view.View, int, int, int, int)" target="_top"><xfont size="+1"><tt>setView</tt></font></A>(<code>View,</nobr> int<nobr>,</nobr> int<nobr>,</nobr> int<nobr>,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=3>Changed Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.app.AlertDialog.setButton_changed(int, java.lang.CharSequence, android.content.DialogInterface.OnClickListener)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/app/AlertDialog.html#setButton(int, java.lang.CharSequence, android.content.DialogInterface.OnClickListener)" target="_top"><xfont size="+1"><tt>setButton</tt></font></A>(<code>int,</nobr> CharSequence<nobr>,</nobr> OnClickListener<nobr><nobr></code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+Change in signature from (<code>CharSequence, OnClickListener</code>) to (<code>int, CharSequence, OnClickListener</code>).<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.app.AlertDialog.setButton_changed(int, java.lang.CharSequence, android.os.Message)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/app/AlertDialog.html#setButton(int, java.lang.CharSequence, android.os.Message)" target="_top"><xfont size="+1"><tt>setButton</tt></font></A>(<code>int,</nobr> CharSequence<nobr>,</nobr> Message<nobr><nobr></code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+Change in signature from (<code>CharSequence, Message</code>) to (<code>int, CharSequence, Message</code>).<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.app.AlertDialog.setButton2_changed(java.lang.CharSequence, android.content.DialogInterface.OnClickListener)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/app/AlertDialog.html#setButton2(java.lang.CharSequence, android.content.DialogInterface.OnClickListener)" target="_top"><xfont size="+1"><tt>setButton2</tt></font></A>(<code>CharSequence,</nobr> OnClickListener<nobr><nobr></code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.app.AlertDialog.setButton2_changed(java.lang.CharSequence, android.os.Message)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/app/AlertDialog.html#setButton2(java.lang.CharSequence, android.os.Message)" target="_top"><xfont size="+1"><tt>setButton2</tt></font></A>(<code>CharSequence,</nobr> Message<nobr><nobr></code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.app.AlertDialog.setButton3_changed(java.lang.CharSequence, android.content.DialogInterface.OnClickListener)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/app/AlertDialog.html#setButton3(java.lang.CharSequence, android.content.DialogInterface.OnClickListener)" target="_top"><xfont size="+1"><tt>setButton3</tt></font></A>(<code>CharSequence,</nobr> OnClickListener<nobr><nobr></code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.app.AlertDialog.setButton3_changed(java.lang.CharSequence, android.os.Message)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/app/AlertDialog.html#setButton3(java.lang.CharSequence, android.os.Message)" target="_top"><xfont size="+1"><tt>setButton3</tt></font></A>(<code>CharSequence,</nobr> Message<nobr><nobr></code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.app.Instrumentation.html b/docs/html/sdk/api_diff/3/changes/android.app.Instrumentation.html
new file mode 100644
index 000000000000..b6f26a6df962
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.app.Instrumentation.html
@@ -0,0 +1,123 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.app.Instrumentation
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.app.<A HREF="../../../../reference/android/app/Instrumentation.html" target="_top"><font size="+3"><tt>Instrumentation</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.app.Instrumentation.callActivityOnUserLeaving_added(android.app.Activity)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/app/Instrumentation.html#callActivityOnUserLeaving(android.app.Activity)" target="_top"><xfont size="+1"><tt>callActivityOnUserLeaving</tt></font></A>(<code>Activity</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.app.LauncherActivity.html b/docs/html/sdk/api_diff/3/changes/android.app.LauncherActivity.html
new file mode 100644
index 000000000000..60f7f29a6071
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.app.LauncherActivity.html
@@ -0,0 +1,148 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.app.LauncherActivity
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.app.<A HREF="../../../../reference/android/app/LauncherActivity.html" target="_top"><font size="+3"><tt>LauncherActivity</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.app.LauncherActivity.intentForPosition_added(int)"></A>
+  <nobr><code>Intent</code>&nbsp;<A HREF="../../../../reference/android/app/LauncherActivity.html#intentForPosition(int)" target="_top"><xfont size="+1"><tt>intentForPosition</tt></font></A>(<code>int</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.app.LauncherActivity.makeListItems_added()"></A>
+  <nobr><code>List&lt;ListItem&gt;</code>&nbsp;<A HREF="../../../../reference/android/app/LauncherActivity.html#makeListItems()" target="_top"><xfont size="+1"><tt>makeListItems</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=3>Changed Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.app.LauncherActivity.getTargetIntent_changed()"></A>
+  <nobr><code>Intent</code>&nbsp;<A HREF="../../../../reference/android/app/LauncherActivity.html#getTargetIntent()" target="_top"><xfont size="+1"><tt>getTargetIntent</tt></font></A>()  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+Changed from abstract to non-abstract.
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.app.PendingIntent.html b/docs/html/sdk/api_diff/3/changes/android.app.PendingIntent.html
new file mode 100644
index 000000000000..6155508fcd81
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.app.PendingIntent.html
@@ -0,0 +1,123 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.app.PendingIntent
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.app.<A HREF="../../../../reference/android/app/PendingIntent.html" target="_top"><font size="+3"><tt>PendingIntent</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<a NAME="fields"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.app.PendingIntent.FLAG_UPDATE_CURRENT"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/app/PendingIntent.html#FLAG_UPDATE_CURRENT" target="_top"><xfont size="+1"><tt>FLAG_UPDATE_CURRENT</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.content.BroadcastReceiver.html b/docs/html/sdk/api_diff/3/changes/android.content.BroadcastReceiver.html
new file mode 100644
index 000000000000..bd8cc8ccadb6
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.content.BroadcastReceiver.html
@@ -0,0 +1,123 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.content.BroadcastReceiver
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.content.<A HREF="../../../../reference/android/content/BroadcastReceiver.html" target="_top"><font size="+3"><tt>BroadcastReceiver</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.BroadcastReceiver.peekService_added(android.content.Context, android.content.Intent)"></A>
+  <nobr><code>IBinder</code>&nbsp;<A HREF="../../../../reference/android/content/BroadcastReceiver.html#peekService(android.content.Context, android.content.Intent)" target="_top"><xfont size="+1"><tt>peekService</tt></font></A>(<code>Context,</nobr> Intent<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.content.ContentProvider.html b/docs/html/sdk/api_diff/3/changes/android.content.ContentProvider.html
new file mode 100644
index 000000000000..c6de32605166
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.content.ContentProvider.html
@@ -0,0 +1,123 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.content.ContentProvider
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.content.<A HREF="../../../../reference/android/content/ContentProvider.html" target="_top"><font size="+3"><tt>ContentProvider</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.ContentProvider.openAssetFile_added(android.net.Uri, java.lang.String)"></A>
+  <nobr><code>AssetFileDescriptor</code>&nbsp;<A HREF="../../../../reference/android/content/ContentProvider.html#openAssetFile(android.net.Uri, java.lang.String)" target="_top"><xfont size="+1"><tt>openAssetFile</tt></font></A>(<code>Uri,</nobr> String<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.content.ContentResolver.html b/docs/html/sdk/api_diff/3/changes/android.content.ContentResolver.html
new file mode 100644
index 000000000000..2101198a7f04
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.content.ContentResolver.html
@@ -0,0 +1,130 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.content.ContentResolver
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.content.<A HREF="../../../../reference/android/content/ContentResolver.html" target="_top"><font size="+3"><tt>ContentResolver</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.ContentResolver.openAssetFileDescriptor_added(android.net.Uri, java.lang.String)"></A>
+  <nobr><code>AssetFileDescriptor</code>&nbsp;<A HREF="../../../../reference/android/content/ContentResolver.html#openAssetFileDescriptor(android.net.Uri, java.lang.String)" target="_top"><xfont size="+1"><tt>openAssetFileDescriptor</tt></font></A>(<code>Uri,</nobr> String<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.ContentResolver.openOutputStream_added(android.net.Uri, java.lang.String)"></A>
+  <nobr><code>OutputStream</code>&nbsp;<A HREF="../../../../reference/android/content/ContentResolver.html#openOutputStream(android.net.Uri, java.lang.String)" target="_top"><xfont size="+1"><tt>openOutputStream</tt></font></A>(<code>Uri,</nobr> String<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.content.Context.html b/docs/html/sdk/api_diff/3/changes/android.content.Context.html
new file mode 100644
index 000000000000..ac3d99da74f2
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.content.Context.html
@@ -0,0 +1,123 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.content.Context
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.content.<A HREF="../../../../reference/android/content/Context.html" target="_top"><font size="+3"><tt>Context</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<a NAME="fields"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.Context.INPUT_METHOD_SERVICE"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/content/Context.html#INPUT_METHOD_SERVICE" target="_top"><xfont size="+1"><tt>INPUT_METHOD_SERVICE</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.content.DialogInterface.html b/docs/html/sdk/api_diff/3/changes/android.content.DialogInterface.html
new file mode 100644
index 000000000000..17dd651368bc
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.content.DialogInterface.html
@@ -0,0 +1,172 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.content.DialogInterface
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Interface android.content.<A HREF="../../../../reference/android/content/DialogInterface.html" target="_top"><font size="+3"><tt>DialogInterface</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<a NAME="fields"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.DialogInterface.BUTTON_NEGATIVE"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/content/DialogInterface.html#BUTTON_NEGATIVE" target="_top"><xfont size="+1"><tt>BUTTON_NEGATIVE</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.DialogInterface.BUTTON_NEUTRAL"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/content/DialogInterface.html#BUTTON_NEUTRAL" target="_top"><xfont size="+1"><tt>BUTTON_NEUTRAL</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.DialogInterface.BUTTON_POSITIVE"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/content/DialogInterface.html#BUTTON_POSITIVE" target="_top"><xfont size="+1"><tt>BUTTON_POSITIVE</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=3>Changed Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.DialogInterface.BUTTON1"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/content/DialogInterface.html#BUTTON1" target="_top"><xfont size="+1"><tt>BUTTON1</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.DialogInterface.BUTTON2"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/content/DialogInterface.html#BUTTON2" target="_top"><xfont size="+1"><tt>BUTTON2</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.DialogInterface.BUTTON3"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/content/DialogInterface.html#BUTTON3" target="_top"><xfont size="+1"><tt>BUTTON3</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.content.Intent.html b/docs/html/sdk/api_diff/3/changes/android.content.Intent.html
new file mode 100644
index 000000000000..edb02387b0aa
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.content.Intent.html
@@ -0,0 +1,251 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.content.Intent
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.content.<A HREF="../../../../reference/android/content/Intent.html" target="_top"><font size="+3"><tt>Intent</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.Intent.replaceExtras_added(android.content.Intent)"></A>
+  <nobr><code>Intent</code>&nbsp;<A HREF="../../../../reference/android/content/Intent.html#replaceExtras(android.content.Intent)" target="_top"><xfont size="+1"><tt>replaceExtras</tt></font></A>(<code>Intent</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.Intent.replaceExtras_added(android.os.Bundle)"></A>
+  <nobr><code>Intent</code>&nbsp;<A HREF="../../../../reference/android/content/Intent.html#replaceExtras(android.os.Bundle)" target="_top"><xfont size="+1"><tt>replaceExtras</tt></font></A>(<code>Bundle</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+<p>
+<a NAME="Removed"></a>
+<TABLE summary="Removed Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Removed Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.Intent.CATEGORY_GADGET"></A>
+  <code>String</code>&nbsp;CATEGORY_GADGET
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.Intent.ACTION_INPUT_METHOD_CHANGED"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/content/Intent.html#ACTION_INPUT_METHOD_CHANGED" target="_top"><xfont size="+1"><tt>ACTION_INPUT_METHOD_CHANGED</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.Intent.ACTION_MEDIA_CHECKING"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/content/Intent.html#ACTION_MEDIA_CHECKING" target="_top"><xfont size="+1"><tt>ACTION_MEDIA_CHECKING</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.Intent.ACTION_MEDIA_NOFS"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/content/Intent.html#ACTION_MEDIA_NOFS" target="_top"><xfont size="+1"><tt>ACTION_MEDIA_NOFS</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.Intent.ACTION_PACKAGE_DATA_CLEARED"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/content/Intent.html#ACTION_PACKAGE_DATA_CLEARED" target="_top"><xfont size="+1"><tt>ACTION_PACKAGE_DATA_CLEARED</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.Intent.ACTION_PACKAGE_REPLACED"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/content/Intent.html#ACTION_PACKAGE_REPLACED" target="_top"><xfont size="+1"><tt>ACTION_PACKAGE_REPLACED</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.Intent.ACTION_SEARCH_LONG_PRESS"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/content/Intent.html#ACTION_SEARCH_LONG_PRESS" target="_top"><xfont size="+1"><tt>ACTION_SEARCH_LONG_PRESS</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.Intent.ACTION_SYSTEM_TUTORIAL"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/content/Intent.html#ACTION_SYSTEM_TUTORIAL" target="_top"><xfont size="+1"><tt>ACTION_SYSTEM_TUTORIAL</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.Intent.ACTION_USER_PRESENT"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/content/Intent.html#ACTION_USER_PRESENT" target="_top"><xfont size="+1"><tt>ACTION_USER_PRESENT</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.Intent.CATEGORY_INFO"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/content/Intent.html#CATEGORY_INFO" target="_top"><xfont size="+1"><tt>CATEGORY_INFO</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.Intent.EXTRA_DATA_REMOVED"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/content/Intent.html#EXTRA_DATA_REMOVED" target="_top"><xfont size="+1"><tt>EXTRA_DATA_REMOVED</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.Intent.EXTRA_REPLACING"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/content/Intent.html#EXTRA_REPLACING" target="_top"><xfont size="+1"><tt>EXTRA_REPLACING</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/content/Intent.html#FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET" target="_top"><xfont size="+1"><tt>FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.Intent.FLAG_ACTIVITY_NO_USER_ACTION"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/content/Intent.html#FLAG_ACTIVITY_NO_USER_ACTION" target="_top"><xfont size="+1"><tt>FLAG_ACTIVITY_NO_USER_ACTION</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.Intent.FLAG_ACTIVITY_REORDER_TO_FRONT"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/content/Intent.html#FLAG_ACTIVITY_REORDER_TO_FRONT" target="_top"><xfont size="+1"><tt>FLAG_ACTIVITY_REORDER_TO_FRONT</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.content.pm.ActivityInfo.html b/docs/html/sdk/api_diff/3/changes/android.content.pm.ActivityInfo.html
new file mode 100644
index 000000000000..5c62f6b769d0
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.content.pm.ActivityInfo.html
@@ -0,0 +1,130 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.content.pm.ActivityInfo
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.content.pm.<A HREF="../../../../reference/android/content/pm/ActivityInfo.html" target="_top"><font size="+3"><tt>ActivityInfo</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<a NAME="fields"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.pm.ActivityInfo.FLAG_NO_HISTORY"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/content/pm/ActivityInfo.html#FLAG_NO_HISTORY" target="_top"><xfont size="+1"><tt>FLAG_NO_HISTORY</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.pm.ActivityInfo.softInputMode"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/content/pm/ActivityInfo.html#softInputMode" target="_top"><xfont size="+1"><tt>softInputMode</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.content.pm.PackageInfo.html b/docs/html/sdk/api_diff/3/changes/android.content.pm.PackageInfo.html
new file mode 100644
index 000000000000..b360d7c2bba2
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.content.pm.PackageInfo.html
@@ -0,0 +1,137 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.content.pm.PackageInfo
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.content.pm.<A HREF="../../../../reference/android/content/pm/PackageInfo.html" target="_top"><font size="+3"><tt>PackageInfo</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<a NAME="fields"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.pm.PackageInfo.configPreferences"></A>
+  <nobr><code>ConfigurationInfo[]</code>&nbsp;<A HREF="../../../../reference/android/content/pm/PackageInfo.html#configPreferences" target="_top"><xfont size="+1"><tt>configPreferences</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.pm.PackageInfo.sharedUserId"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/content/pm/PackageInfo.html#sharedUserId" target="_top"><xfont size="+1"><tt>sharedUserId</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.pm.PackageInfo.sharedUserLabel"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/content/pm/PackageInfo.html#sharedUserLabel" target="_top"><xfont size="+1"><tt>sharedUserLabel</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.content.pm.PackageManager.html b/docs/html/sdk/api_diff/3/changes/android.content.pm.PackageManager.html
new file mode 100644
index 000000000000..efd37c54f3b1
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.content.pm.PackageManager.html
@@ -0,0 +1,166 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.content.pm.PackageManager
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.content.pm.<A HREF="../../../../reference/android/content/pm/PackageManager.html" target="_top"><font size="+3"><tt>PackageManager</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.pm.PackageManager.getLaunchIntentForPackage_added(java.lang.String)"></A>
+  <nobr><code>Intent</code>&nbsp;<A HREF="../../../../reference/android/content/pm/PackageManager.html#getLaunchIntentForPackage(java.lang.String)" target="_top"><xfont size="+1"><tt>getLaunchIntentForPackage</tt></font></A>(<code>String</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.pm.PackageManager.getSystemSharedLibraryNames_added()"></A>
+  <nobr><code>String[]</code>&nbsp;<A HREF="../../../../reference/android/content/pm/PackageManager.html#getSystemSharedLibraryNames()" target="_top"><xfont size="+1"><tt>getSystemSharedLibraryNames</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.pm.PackageManager.isSafeMode_added()"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/content/pm/PackageManager.html#isSafeMode()" target="_top"><xfont size="+1"><tt>isSafeMode</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.pm.PackageManager.GET_CONFIGURATIONS"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/content/pm/PackageManager.html#GET_CONFIGURATIONS" target="_top"><xfont size="+1"><tt>GET_CONFIGURATIONS</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.pm.PackageManager.GET_UNINSTALLED_PACKAGES"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/content/pm/PackageManager.html#GET_UNINSTALLED_PACKAGES" target="_top"><xfont size="+1"><tt>GET_UNINSTALLED_PACKAGES</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.pm.PackageManager.INSTALL_FAILED_CONFLICTING_PROVIDER"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/content/pm/PackageManager.html#INSTALL_FAILED_CONFLICTING_PROVIDER" target="_top"><xfont size="+1"><tt>INSTALL_FAILED_CONFLICTING_PROVIDER</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.content.res.AssetFileDescriptor.html b/docs/html/sdk/api_diff/3/changes/android.content.res.AssetFileDescriptor.html
new file mode 100644
index 000000000000..458a70a74ecf
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.content.res.AssetFileDescriptor.html
@@ -0,0 +1,174 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.content.res.AssetFileDescriptor
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.content.res.<A HREF="../../../../reference/android/content/res/AssetFileDescriptor.html" target="_top"><font size="+3"><tt>AssetFileDescriptor</tt></font></A>
+</H2>
+<p><font xsize="+1">Added interface <code>android.os.Parcelable</code>.<br></font>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.res.AssetFileDescriptor.createInputStream_added()"></A>
+  <nobr><code>FileInputStream</code>&nbsp;<A HREF="../../../../reference/android/content/res/AssetFileDescriptor.html#createInputStream()" target="_top"><xfont size="+1"><tt>createInputStream</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.res.AssetFileDescriptor.createOutputStream_added()"></A>
+  <nobr><code>FileOutputStream</code>&nbsp;<A HREF="../../../../reference/android/content/res/AssetFileDescriptor.html#createOutputStream()" target="_top"><xfont size="+1"><tt>createOutputStream</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.res.AssetFileDescriptor.describeContents_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/content/res/AssetFileDescriptor.html#describeContents()" target="_top"><xfont size="+1"><tt>describeContents</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.res.AssetFileDescriptor.getDeclaredLength_added()"></A>
+  <nobr><code>long</code>&nbsp;<A HREF="../../../../reference/android/content/res/AssetFileDescriptor.html#getDeclaredLength()" target="_top"><xfont size="+1"><tt>getDeclaredLength</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.res.AssetFileDescriptor.writeToParcel_added(android.os.Parcel, int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/content/res/AssetFileDescriptor.html#writeToParcel(android.os.Parcel, int)" target="_top"><xfont size="+1"><tt>writeToParcel</tt></font></A>(<code>Parcel,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.res.AssetFileDescriptor.CREATOR"></A>
+  <nobr><code>Creator</code>&nbsp;<A HREF="../../../../reference/android/content/res/AssetFileDescriptor.html#CREATOR" target="_top"><xfont size="+1"><tt>CREATOR</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.res.AssetFileDescriptor.UNKNOWN_LENGTH"></A>
+  <nobr><code>long</code>&nbsp;<A HREF="../../../../reference/android/content/res/AssetFileDescriptor.html#UNKNOWN_LENGTH" target="_top"><xfont size="+1"><tt>UNKNOWN_LENGTH</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.content.res.Configuration.html b/docs/html/sdk/api_diff/3/changes/android.content.res.Configuration.html
new file mode 100644
index 000000000000..3b8f943aceb7
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.content.res.Configuration.html
@@ -0,0 +1,144 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.content.res.Configuration
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.content.res.<A HREF="../../../../reference/android/content/res/Configuration.html" target="_top"><font size="+3"><tt>Configuration</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<a NAME="fields"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.res.Configuration.HARDKEYBOARDHIDDEN_NO"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/content/res/Configuration.html#HARDKEYBOARDHIDDEN_NO" target="_top"><xfont size="+1"><tt>HARDKEYBOARDHIDDEN_NO</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.res.Configuration.HARDKEYBOARDHIDDEN_UNDEFINED"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/content/res/Configuration.html#HARDKEYBOARDHIDDEN_UNDEFINED" target="_top"><xfont size="+1"><tt>HARDKEYBOARDHIDDEN_UNDEFINED</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.res.Configuration.HARDKEYBOARDHIDDEN_YES"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/content/res/Configuration.html#HARDKEYBOARDHIDDEN_YES" target="_top"><xfont size="+1"><tt>HARDKEYBOARDHIDDEN_YES</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.res.Configuration.hardKeyboardHidden"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/content/res/Configuration.html#hardKeyboardHidden" target="_top"><xfont size="+1"><tt>hardKeyboardHidden</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.content.res.Resources.html b/docs/html/sdk/api_diff/3/changes/android.content.res.Resources.html
new file mode 100644
index 000000000000..7fde1f983310
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.content.res.Resources.html
@@ -0,0 +1,151 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.content.res.Resources
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.content.res.<A HREF="../../../../reference/android/content/res/Resources.html" target="_top"><font size="+3"><tt>Resources</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.res.Resources.getBoolean_added(int)"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/content/res/Resources.html#getBoolean(int)" target="_top"><xfont size="+1"><tt>getBoolean</tt></font></A>(<code>int</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.res.Resources.getFraction_added(int, int, int)"></A>
+  <nobr><code>float</code>&nbsp;<A HREF="../../../../reference/android/content/res/Resources.html#getFraction(int, int, int)" target="_top"><xfont size="+1"><tt>getFraction</tt></font></A>(<code>int,</nobr> int<nobr>,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.res.Resources.openRawResource_added(int, android.util.TypedValue)"></A>
+  <nobr><code>InputStream</code>&nbsp;<A HREF="../../../../reference/android/content/res/Resources.html#openRawResource(int, android.util.TypedValue)" target="_top"><xfont size="+1"><tt>openRawResource</tt></font></A>(<code>int,</nobr> TypedValue<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.res.Resources.parseBundleExtra_added(java.lang.String, android.util.AttributeSet, android.os.Bundle)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/content/res/Resources.html#parseBundleExtra(java.lang.String, android.util.AttributeSet, android.os.Bundle)" target="_top"><xfont size="+1"><tt>parseBundleExtra</tt></font></A>(<code>String,</nobr> AttributeSet<nobr>,</nobr> Bundle<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.res.Resources.parseBundleExtras_added(android.content.res.XmlResourceParser, android.os.Bundle)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/content/res/Resources.html#parseBundleExtras(android.content.res.XmlResourceParser, android.os.Bundle)" target="_top"><xfont size="+1"><tt>parseBundleExtras</tt></font></A>(<code>XmlResourceParser,</nobr> Bundle<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.content.res.TypedArray.html b/docs/html/sdk/api_diff/3/changes/android.content.res.TypedArray.html
new file mode 100644
index 000000000000..f1336fc7d7ed
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.content.res.TypedArray.html
@@ -0,0 +1,123 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.content.res.TypedArray
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.content.res.<A HREF="../../../../reference/android/content/res/TypedArray.html" target="_top"><font size="+3"><tt>TypedArray</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.res.TypedArray.getLayoutDimension_added(int, int)"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/content/res/TypedArray.html#getLayoutDimension(int, int)" target="_top"><xfont size="+1"><tt>getLayoutDimension</tt></font></A>(<code>int,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.database.Cursor.html b/docs/html/sdk/api_diff/3/changes/android.database.Cursor.html
new file mode 100644
index 000000000000..020402a4c714
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.database.Cursor.html
@@ -0,0 +1,126 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.database.Cursor
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Interface android.database.<A HREF="../../../../reference/android/database/Cursor.html" target="_top"><font size="+3"><tt>Cursor</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=3>Changed Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.database.Cursor.getColumnIndex_changed(java.lang.String)"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/database/Cursor.html#getColumnIndex(java.lang.String)" target="_top"><xfont size="+1"><tt>getColumnIndex</tt></font></A>(<code>String</code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+Change from deprecated to undeprecated.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.database.CursorWrapper.html b/docs/html/sdk/api_diff/3/changes/android.database.CursorWrapper.html
new file mode 100644
index 000000000000..3a7675d57da6
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.database.CursorWrapper.html
@@ -0,0 +1,126 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.database.CursorWrapper
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.database.<A HREF="../../../../reference/android/database/CursorWrapper.html" target="_top"><font size="+3"><tt>CursorWrapper</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=3>Changed Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.database.CursorWrapper.getColumnIndex_changed(java.lang.String)"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/database/CursorWrapper.html#getColumnIndex(java.lang.String)" target="_top"><xfont size="+1"><tt>getColumnIndex</tt></font></A>(<code>String</code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+Change from deprecated to undeprecated.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.database.DatabaseUtils.html b/docs/html/sdk/api_diff/3/changes/android.database.DatabaseUtils.html
new file mode 100644
index 000000000000..114beaeeee62
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.database.DatabaseUtils.html
@@ -0,0 +1,126 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.database.DatabaseUtils
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.database.<A HREF="../../../../reference/android/database/DatabaseUtils.html" target="_top"><font size="+3"><tt>DatabaseUtils</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=3>Changed Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.database.DatabaseUtils.appendEscapedSQLString_changed(java.lang.StringBuilder, java.lang.String)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/database/DatabaseUtils.html#appendEscapedSQLString(java.lang.StringBuilder, java.lang.String)" target="_top"><xfont size="+1"><tt>appendEscapedSQLString</tt></font></A>(<code>StringBuilder,</nobr> String<nobr><nobr></code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+Change from deprecated to undeprecated.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.database.sqlite.SQLiteDatabase.html b/docs/html/sdk/api_diff/3/changes/android.database.sqlite.SQLiteDatabase.html
new file mode 100644
index 000000000000..cd59c1b85431
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.database.sqlite.SQLiteDatabase.html
@@ -0,0 +1,141 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.database.sqlite.SQLiteDatabase
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.database.sqlite.<A HREF="../../../../reference/android/database/sqlite/SQLiteDatabase.html" target="_top"><font size="+3"><tt>SQLiteDatabase</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.database.sqlite.SQLiteDatabase.yieldIfContendedSafely_added()"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/database/sqlite/SQLiteDatabase.html#yieldIfContendedSafely()" target="_top"><xfont size="+1"><tt>yieldIfContendedSafely</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=3>Changed Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.database.sqlite.SQLiteDatabase.yieldIfContended_changed()"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/database/sqlite/SQLiteDatabase.html#yieldIfContended()" target="_top"><xfont size="+1"><tt>yieldIfContended</tt></font></A>()  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.graphics.Bitmap.html b/docs/html/sdk/api_diff/3/changes/android.graphics.Bitmap.html
new file mode 100644
index 000000000000..f6ddc29c10bf
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.graphics.Bitmap.html
@@ -0,0 +1,123 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.graphics.Bitmap
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.graphics.<A HREF="../../../../reference/android/graphics/Bitmap.html" target="_top"><font size="+3"><tt>Bitmap</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.graphics.Bitmap.copyPixelsFromBuffer_added(java.nio.Buffer)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/graphics/Bitmap.html#copyPixelsFromBuffer(java.nio.Buffer)" target="_top"><xfont size="+1"><tt>copyPixelsFromBuffer</tt></font></A>(<code>Buffer</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.graphics.Canvas.html b/docs/html/sdk/api_diff/3/changes/android.graphics.Canvas.html
new file mode 100644
index 000000000000..cf8ceef7ab5f
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.graphics.Canvas.html
@@ -0,0 +1,123 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.graphics.Canvas
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.graphics.<A HREF="../../../../reference/android/graphics/Canvas.html" target="_top"><font size="+3"><tt>Canvas</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.graphics.Canvas.drawBitmap_added(int[], int, int, float, float, int, int, boolean, android.graphics.Paint)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/graphics/Canvas.html#drawBitmap(int[], int, int, float, float, int, int, boolean, android.graphics.Paint)" target="_top"><xfont size="+1"><tt>drawBitmap</tt></font></A>(<code>int[],</nobr> int<nobr>,</nobr> int<nobr>,</nobr> float<nobr>,</nobr> float<nobr>,</nobr> int<nobr>,</nobr> int<nobr>,</nobr> boolean<nobr>,</nobr> Paint<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.graphics.Rect.html b/docs/html/sdk/api_diff/3/changes/android.graphics.Rect.html
new file mode 100644
index 000000000000..1c0b1f342d37
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.graphics.Rect.html
@@ -0,0 +1,123 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.graphics.Rect
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.graphics.<A HREF="../../../../reference/android/graphics/Rect.html" target="_top"><font size="+3"><tt>Rect</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.graphics.Rect.toShortString_added()"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/graphics/Rect.html#toShortString()" target="_top"><xfont size="+1"><tt>toShortString</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.graphics.RectF.html b/docs/html/sdk/api_diff/3/changes/android.graphics.RectF.html
new file mode 100644
index 000000000000..4e9b91b2a2ed
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.graphics.RectF.html
@@ -0,0 +1,153 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.graphics.RectF
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.graphics.<A HREF="../../../../reference/android/graphics/RectF.html" target="_top"><font size="+3"><tt>RectF</tt></font></A>
+</H2>
+<p><font xsize="+1">Added interface <code>android.os.Parcelable</code>.<br></font>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.graphics.RectF.describeContents_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/graphics/RectF.html#describeContents()" target="_top"><xfont size="+1"><tt>describeContents</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.graphics.RectF.readFromParcel_added(android.os.Parcel)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/graphics/RectF.html#readFromParcel(android.os.Parcel)" target="_top"><xfont size="+1"><tt>readFromParcel</tt></font></A>(<code>Parcel</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.graphics.RectF.writeToParcel_added(android.os.Parcel, int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/graphics/RectF.html#writeToParcel(android.os.Parcel, int)" target="_top"><xfont size="+1"><tt>writeToParcel</tt></font></A>(<code>Parcel,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.graphics.RectF.CREATOR"></A>
+  <nobr><code>Creator</code>&nbsp;<A HREF="../../../../reference/android/graphics/RectF.html#CREATOR" target="_top"><xfont size="+1"><tt>CREATOR</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.graphics.drawable.Drawable.html b/docs/html/sdk/api_diff/3/changes/android.graphics.drawable.Drawable.html
new file mode 100644
index 000000000000..faa70b96da44
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.graphics.drawable.Drawable.html
@@ -0,0 +1,123 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.graphics.drawable.Drawable
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.graphics.drawable.<A HREF="../../../../reference/android/graphics/drawable/Drawable.html" target="_top"><font size="+3"><tt>Drawable</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.graphics.drawable.Drawable.mutate_added()"></A>
+  <nobr><code>Drawable</code>&nbsp;<A HREF="../../../../reference/android/graphics/drawable/Drawable.html#mutate()" target="_top"><xfont size="+1"><tt>mutate</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.graphics.drawable.RotateDrawable.html b/docs/html/sdk/api_diff/3/changes/android.graphics.drawable.RotateDrawable.html
new file mode 100644
index 000000000000..8cffe1e0bdb9
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.graphics.drawable.RotateDrawable.html
@@ -0,0 +1,123 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.graphics.drawable.RotateDrawable
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.graphics.drawable.<A HREF="../../../../reference/android/graphics/drawable/RotateDrawable.html" target="_top"><font size="+3"><tt>RotateDrawable</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.graphics.drawable.RotateDrawable.getDrawable_added()"></A>
+  <nobr><code>Drawable</code>&nbsp;<A HREF="../../../../reference/android/graphics/drawable/RotateDrawable.html#getDrawable()" target="_top"><xfont size="+1"><tt>getDrawable</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.graphics.drawable.ScaleDrawable.html b/docs/html/sdk/api_diff/3/changes/android.graphics.drawable.ScaleDrawable.html
new file mode 100644
index 000000000000..529f38026ebe
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.graphics.drawable.ScaleDrawable.html
@@ -0,0 +1,123 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.graphics.drawable.ScaleDrawable
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.graphics.drawable.<A HREF="../../../../reference/android/graphics/drawable/ScaleDrawable.html" target="_top"><font size="+3"><tt>ScaleDrawable</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.graphics.drawable.ScaleDrawable.getDrawable_added()"></A>
+  <nobr><code>Drawable</code>&nbsp;<A HREF="../../../../reference/android/graphics/drawable/ScaleDrawable.html#getDrawable()" target="_top"><xfont size="+1"><tt>getDrawable</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.graphics.drawable.TransitionDrawable.html b/docs/html/sdk/api_diff/3/changes/android.graphics.drawable.TransitionDrawable.html
new file mode 100644
index 000000000000..d7dc8eafcf3c
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.graphics.drawable.TransitionDrawable.html
@@ -0,0 +1,123 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.graphics.drawable.TransitionDrawable
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.graphics.drawable.<A HREF="../../../../reference/android/graphics/drawable/TransitionDrawable.html" target="_top"><font size="+3"><tt>TransitionDrawable</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Constructors" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Constructors</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.graphics.drawable.TransitionDrawable.ctor_added(android.graphics.drawable.Drawable[])"></A>
+  <nobr><A HREF="../../../../reference/android/graphics/drawable/TransitionDrawable.html#TransitionDrawable(android.graphics.drawable.Drawable[])" target="_top"><xfont size="+1"><tt>TransitionDrawable</tt></font></A>(<code>Drawable[]</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="methods"></a>
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.graphics.drawable.shapes.Shape.html b/docs/html/sdk/api_diff/3/changes/android.graphics.drawable.shapes.Shape.html
new file mode 100644
index 000000000000..836aa9215913
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.graphics.drawable.shapes.Shape.html
@@ -0,0 +1,128 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.graphics.drawable.shapes.Shape
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.graphics.drawable.shapes.<A HREF="../../../../reference/android/graphics/drawable/shapes/Shape.html" target="_top"><font size="+3"><tt>Shape</tt></font></A>
+</H2>
+<p><font xsize="+1">Added interface <code>java.lang.Cloneable</code>.<br></font>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=3>Changed Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.graphics.drawable.shapes.Shape.clone_changed()"></A>
+  <nobr><code>Shape</code>&nbsp;<A HREF="../../../../reference/android/graphics/drawable/shapes/Shape.html#clone()" target="_top"><xfont size="+1"><tt>clone</tt></font></A>()  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+Change in return type from <code>Object</code> to <code>Shape</code>.<br>
+ Method was inherited from <tt>java.lang.Object</tt>, but is now defined locally. Change of visibility from protected to public.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.hardware.Camera.html b/docs/html/sdk/api_diff/3/changes/android.hardware.Camera.html
new file mode 100644
index 000000000000..b7a0dd37a122
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.hardware.Camera.html
@@ -0,0 +1,141 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.hardware.Camera
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.hardware.<A HREF="../../../../reference/android/hardware/Camera.html" target="_top"><font size="+3"><tt>Camera</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.hardware.Camera.setOneShotPreviewCallback_added(android.hardware.Camera.PreviewCallback)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/hardware/Camera.html#setOneShotPreviewCallback(android.hardware.Camera.PreviewCallback)" target="_top"><xfont size="+1"><tt>setOneShotPreviewCallback</tt></font></A>(<code>PreviewCallback</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=3>Changed Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.hardware.Camera.setPreviewDisplay_changed(android.view.SurfaceHolder)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/hardware/Camera.html#setPreviewDisplay(android.view.SurfaceHolder)" target="_top"><xfont size="+1"><tt>setPreviewDisplay</tt></font></A>(<code>SurfaceHolder</code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+Change in exceptions thrown from no exceptions to <code>java.io.IOException</code>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.hardware.SensorListener.html b/docs/html/sdk/api_diff/3/changes/android.hardware.SensorListener.html
new file mode 100644
index 000000000000..9b63571fcf52
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.hardware.SensorListener.html
@@ -0,0 +1,109 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.hardware.SensorListener
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Interface android.hardware.<A HREF="../../../../reference/android/hardware/SensorListener.html" target="_top"><font size="+3"><tt>SensorListener</tt></font></A>
+</H2>
+<p><b>Now deprecated</b>.<br>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.hardware.SensorManager.html b/docs/html/sdk/api_diff/3/changes/android.hardware.SensorManager.html
new file mode 100644
index 000000000000..e42eebaf21f9
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.hardware.SensorManager.html
@@ -0,0 +1,473 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.hardware.SensorManager
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.hardware.<A HREF="../../../../reference/android/hardware/SensorManager.html" target="_top"><font size="+3"><tt>SensorManager</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.hardware.SensorManager.getDefaultSensor_added(int)"></A>
+  <nobr><code>Sensor</code>&nbsp;<A HREF="../../../../reference/android/hardware/SensorManager.html#getDefaultSensor(int)" target="_top"><xfont size="+1"><tt>getDefaultSensor</tt></font></A>(<code>int</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.hardware.SensorManager.getInclination_added(float[])"></A>
+  <nobr><code>float</code>&nbsp;<A HREF="../../../../reference/android/hardware/SensorManager.html#getInclination(float[])" target="_top"><xfont size="+1"><tt>getInclination</tt></font></A>(<code>float[]</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.hardware.SensorManager.getOrientation_added(float[], float[])"></A>
+  <nobr><code>float[]</code>&nbsp;<A HREF="../../../../reference/android/hardware/SensorManager.html#getOrientation(float[], float[])" target="_top"><xfont size="+1"><tt>getOrientation</tt></font></A>(<code>float[],</nobr> float[]<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.hardware.SensorManager.getRotationMatrix_added(float[], float[], float[], float[])"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/hardware/SensorManager.html#getRotationMatrix(float[], float[], float[], float[])" target="_top"><xfont size="+1"><tt>getRotationMatrix</tt></font></A>(<code>float[],</nobr> float[]<nobr>,</nobr> float[]<nobr>,</nobr> float[]<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.hardware.SensorManager.getSensorList_added(int)"></A>
+  <nobr><code>List&lt;Sensor&gt;</code>&nbsp;<A HREF="../../../../reference/android/hardware/SensorManager.html#getSensorList(int)" target="_top"><xfont size="+1"><tt>getSensorList</tt></font></A>(<code>int</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.hardware.SensorManager.registerListener_added(android.hardware.SensorEventListener, android.hardware.Sensor, int)"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/hardware/SensorManager.html#registerListener(android.hardware.SensorEventListener, android.hardware.Sensor, int)" target="_top"><xfont size="+1"><tt>registerListener</tt></font></A>(<code>SensorEventListener,</nobr> Sensor<nobr>,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.hardware.SensorManager.registerListener_added(android.hardware.SensorEventListener, android.hardware.Sensor, int, android.os.Handler)"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/hardware/SensorManager.html#registerListener(android.hardware.SensorEventListener, android.hardware.Sensor, int, android.os.Handler)" target="_top"><xfont size="+1"><tt>registerListener</tt></font></A>(<code>SensorEventListener,</nobr> Sensor<nobr>,</nobr> int<nobr>,</nobr> Handler<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.hardware.SensorManager.remapCoordinateSystem_added(float[], int, int, float[])"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/hardware/SensorManager.html#remapCoordinateSystem(float[], int, int, float[])" target="_top"><xfont size="+1"><tt>remapCoordinateSystem</tt></font></A>(<code>float[],</nobr> int<nobr>,</nobr> int<nobr>,</nobr> float[]<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.hardware.SensorManager.unregisterListener_added(android.hardware.SensorEventListener)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/hardware/SensorManager.html#unregisterListener(android.hardware.SensorEventListener)" target="_top"><xfont size="+1"><tt>unregisterListener</tt></font></A>(<code>SensorEventListener</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.hardware.SensorManager.unregisterListener_added(android.hardware.SensorEventListener, android.hardware.Sensor)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/hardware/SensorManager.html#unregisterListener(android.hardware.SensorEventListener, android.hardware.Sensor)" target="_top"><xfont size="+1"><tt>unregisterListener</tt></font></A>(<code>SensorEventListener,</nobr> Sensor<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=3>Changed Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.hardware.SensorManager.getSensors_changed()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/hardware/SensorManager.html#getSensors()" target="_top"><xfont size="+1"><tt>getSensors</tt></font></A>()  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.hardware.SensorManager.registerListener_changed(android.hardware.SensorListener, int)"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/hardware/SensorManager.html#registerListener(android.hardware.SensorListener, int)" target="_top"><xfont size="+1"><tt>registerListener</tt></font></A>(<code>SensorListener,</nobr> int<nobr><nobr></code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.hardware.SensorManager.registerListener_changed(android.hardware.SensorListener, int, int)"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/hardware/SensorManager.html#registerListener(android.hardware.SensorListener, int, int)" target="_top"><xfont size="+1"><tt>registerListener</tt></font></A>(<code>SensorListener,</nobr> int<nobr>,</nobr> int<nobr><nobr></code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.hardware.SensorManager.unregisterListener_changed(android.hardware.SensorListener)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/hardware/SensorManager.html#unregisterListener(android.hardware.SensorListener)" target="_top"><xfont size="+1"><tt>unregisterListener</tt></font></A>(<code>SensorListener</code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.hardware.SensorManager.unregisterListener_changed(android.hardware.SensorListener, int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/hardware/SensorManager.html#unregisterListener(android.hardware.SensorListener, int)" target="_top"><xfont size="+1"><tt>unregisterListener</tt></font></A>(<code>SensorListener,</nobr> int<nobr><nobr></code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.hardware.SensorManager.AXIS_MINUS_X"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/hardware/SensorManager.html#AXIS_MINUS_X" target="_top"><xfont size="+1"><tt>AXIS_MINUS_X</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.hardware.SensorManager.AXIS_MINUS_Y"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/hardware/SensorManager.html#AXIS_MINUS_Y" target="_top"><xfont size="+1"><tt>AXIS_MINUS_Y</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.hardware.SensorManager.AXIS_MINUS_Z"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/hardware/SensorManager.html#AXIS_MINUS_Z" target="_top"><xfont size="+1"><tt>AXIS_MINUS_Z</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.hardware.SensorManager.AXIS_X"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/hardware/SensorManager.html#AXIS_X" target="_top"><xfont size="+1"><tt>AXIS_X</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.hardware.SensorManager.AXIS_Y"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/hardware/SensorManager.html#AXIS_Y" target="_top"><xfont size="+1"><tt>AXIS_Y</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.hardware.SensorManager.AXIS_Z"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/hardware/SensorManager.html#AXIS_Z" target="_top"><xfont size="+1"><tt>AXIS_Z</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=3>Changed Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.hardware.SensorManager.DATA_X"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/hardware/SensorManager.html#DATA_X" target="_top"><xfont size="+1"><tt>DATA_X</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.hardware.SensorManager.DATA_Y"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/hardware/SensorManager.html#DATA_Y" target="_top"><xfont size="+1"><tt>DATA_Y</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.hardware.SensorManager.DATA_Z"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/hardware/SensorManager.html#DATA_Z" target="_top"><xfont size="+1"><tt>DATA_Z</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.hardware.SensorManager.LIGHT_NO_MOON"></A>
+  <nobr><code>float</code>&nbsp;<A HREF="../../../../reference/android/hardware/SensorManager.html#LIGHT_NO_MOON" target="_top"><xfont size="+1"><tt>LIGHT_NO_MOON</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+Changed in value from 0.0010f to 0.001f.
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.hardware.SensorManager.RAW_DATA_INDEX"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/hardware/SensorManager.html#RAW_DATA_INDEX" target="_top"><xfont size="+1"><tt>RAW_DATA_INDEX</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.hardware.SensorManager.RAW_DATA_X"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/hardware/SensorManager.html#RAW_DATA_X" target="_top"><xfont size="+1"><tt>RAW_DATA_X</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.hardware.SensorManager.RAW_DATA_Y"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/hardware/SensorManager.html#RAW_DATA_Y" target="_top"><xfont size="+1"><tt>RAW_DATA_Y</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.hardware.SensorManager.RAW_DATA_Z"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/hardware/SensorManager.html#RAW_DATA_Z" target="_top"><xfont size="+1"><tt>RAW_DATA_Z</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.hardware.SensorManager.SENSOR_ACCELEROMETER"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/hardware/SensorManager.html#SENSOR_ACCELEROMETER" target="_top"><xfont size="+1"><tt>SENSOR_ACCELEROMETER</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.hardware.SensorManager.SENSOR_ALL"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/hardware/SensorManager.html#SENSOR_ALL" target="_top"><xfont size="+1"><tt>SENSOR_ALL</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.hardware.SensorManager.SENSOR_LIGHT"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/hardware/SensorManager.html#SENSOR_LIGHT" target="_top"><xfont size="+1"><tt>SENSOR_LIGHT</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.hardware.SensorManager.SENSOR_MAGNETIC_FIELD"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/hardware/SensorManager.html#SENSOR_MAGNETIC_FIELD" target="_top"><xfont size="+1"><tt>SENSOR_MAGNETIC_FIELD</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.hardware.SensorManager.SENSOR_MAX"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/hardware/SensorManager.html#SENSOR_MAX" target="_top"><xfont size="+1"><tt>SENSOR_MAX</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.hardware.SensorManager.SENSOR_MIN"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/hardware/SensorManager.html#SENSOR_MIN" target="_top"><xfont size="+1"><tt>SENSOR_MIN</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.hardware.SensorManager.SENSOR_ORIENTATION"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/hardware/SensorManager.html#SENSOR_ORIENTATION" target="_top"><xfont size="+1"><tt>SENSOR_ORIENTATION</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.hardware.SensorManager.SENSOR_ORIENTATION_RAW"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/hardware/SensorManager.html#SENSOR_ORIENTATION_RAW" target="_top"><xfont size="+1"><tt>SENSOR_ORIENTATION_RAW</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.hardware.SensorManager.SENSOR_PROXIMITY"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/hardware/SensorManager.html#SENSOR_PROXIMITY" target="_top"><xfont size="+1"><tt>SENSOR_PROXIMITY</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.hardware.SensorManager.SENSOR_TEMPERATURE"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/hardware/SensorManager.html#SENSOR_TEMPERATURE" target="_top"><xfont size="+1"><tt>SENSOR_TEMPERATURE</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.hardware.SensorManager.SENSOR_TRICORDER"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/hardware/SensorManager.html#SENSOR_TRICORDER" target="_top"><xfont size="+1"><tt>SENSOR_TRICORDER</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.location.Location.html b/docs/html/sdk/api_diff/3/changes/android.location.Location.html
new file mode 100644
index 000000000000..03d3f894f33c
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.location.Location.html
@@ -0,0 +1,123 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.location.Location
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.location.<A HREF="../../../../reference/android/location/Location.html" target="_top"><font size="+3"><tt>Location</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.location.Location.dump_added(android.util.Printer, java.lang.String)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/location/Location.html#dump(android.util.Printer, java.lang.String)" target="_top"><xfont size="+1"><tt>dump</tt></font></A>(<code>Printer,</nobr> String<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.location.LocationManager.html b/docs/html/sdk/api_diff/3/changes/android.location.LocationManager.html
new file mode 100644
index 000000000000..4cd68386cbd4
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.location.LocationManager.html
@@ -0,0 +1,243 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.location.LocationManager
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.location.<A HREF="../../../../reference/android/location/LocationManager.html" target="_top"><font size="+3"><tt>LocationManager</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.location.LocationManager.addGpsStatusListener_added(android.location.GpsStatus.Listener)"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/location/LocationManager.html#addGpsStatusListener(android.location.GpsStatus.Listener)" target="_top"><xfont size="+1"><tt>addGpsStatusListener</tt></font></A>(<code>Listener</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.location.LocationManager.addTestProvider_added(java.lang.String, boolean, boolean, boolean, boolean, boolean, boolean, boolean, int, int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/location/LocationManager.html#addTestProvider(java.lang.String, boolean, boolean, boolean, boolean, boolean, boolean, boolean, int, int)" target="_top"><xfont size="+1"><tt>addTestProvider</tt></font></A>(<code>String,</nobr> boolean<nobr>,</nobr> boolean<nobr>,</nobr> boolean<nobr>,</nobr> boolean<nobr>,</nobr> boolean<nobr>,</nobr> boolean<nobr>,</nobr> boolean<nobr>,</nobr> int<nobr>,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.location.LocationManager.clearTestProviderEnabled_added(java.lang.String)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/location/LocationManager.html#clearTestProviderEnabled(java.lang.String)" target="_top"><xfont size="+1"><tt>clearTestProviderEnabled</tt></font></A>(<code>String</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.location.LocationManager.clearTestProviderLocation_added(java.lang.String)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/location/LocationManager.html#clearTestProviderLocation(java.lang.String)" target="_top"><xfont size="+1"><tt>clearTestProviderLocation</tt></font></A>(<code>String</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.location.LocationManager.clearTestProviderStatus_added(java.lang.String)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/location/LocationManager.html#clearTestProviderStatus(java.lang.String)" target="_top"><xfont size="+1"><tt>clearTestProviderStatus</tt></font></A>(<code>String</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.location.LocationManager.getGpsStatus_added(android.location.GpsStatus)"></A>
+  <nobr><code>GpsStatus</code>&nbsp;<A HREF="../../../../reference/android/location/LocationManager.html#getGpsStatus(android.location.GpsStatus)" target="_top"><xfont size="+1"><tt>getGpsStatus</tt></font></A>(<code>GpsStatus</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.location.LocationManager.removeGpsStatusListener_added(android.location.GpsStatus.Listener)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/location/LocationManager.html#removeGpsStatusListener(android.location.GpsStatus.Listener)" target="_top"><xfont size="+1"><tt>removeGpsStatusListener</tt></font></A>(<code>Listener</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.location.LocationManager.removeTestProvider_added(java.lang.String)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/location/LocationManager.html#removeTestProvider(java.lang.String)" target="_top"><xfont size="+1"><tt>removeTestProvider</tt></font></A>(<code>String</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.location.LocationManager.removeUpdates_added(android.app.PendingIntent)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/location/LocationManager.html#removeUpdates(android.app.PendingIntent)" target="_top"><xfont size="+1"><tt>removeUpdates</tt></font></A>(<code>PendingIntent</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.location.LocationManager.requestLocationUpdates_added(java.lang.String, long, float, android.app.PendingIntent)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/location/LocationManager.html#requestLocationUpdates(java.lang.String, long, float, android.app.PendingIntent)" target="_top"><xfont size="+1"><tt>requestLocationUpdates</tt></font></A>(<code>String,</nobr> long<nobr>,</nobr> float<nobr>,</nobr> PendingIntent<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.location.LocationManager.sendExtraCommand_added(java.lang.String, java.lang.String, android.os.Bundle)"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/location/LocationManager.html#sendExtraCommand(java.lang.String, java.lang.String, android.os.Bundle)" target="_top"><xfont size="+1"><tt>sendExtraCommand</tt></font></A>(<code>String,</nobr> String<nobr>,</nobr> Bundle<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.location.LocationManager.setTestProviderEnabled_added(java.lang.String, boolean)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/location/LocationManager.html#setTestProviderEnabled(java.lang.String, boolean)" target="_top"><xfont size="+1"><tt>setTestProviderEnabled</tt></font></A>(<code>String,</nobr> boolean<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.location.LocationManager.setTestProviderLocation_added(java.lang.String, android.location.Location)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/location/LocationManager.html#setTestProviderLocation(java.lang.String, android.location.Location)" target="_top"><xfont size="+1"><tt>setTestProviderLocation</tt></font></A>(<code>String,</nobr> Location<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.location.LocationManager.setTestProviderStatus_added(java.lang.String, int, android.os.Bundle, long)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/location/LocationManager.html#setTestProviderStatus(java.lang.String, int, android.os.Bundle, long)" target="_top"><xfont size="+1"><tt>setTestProviderStatus</tt></font></A>(<code>String,</nobr> int<nobr>,</nobr> Bundle<nobr>,</nobr> long<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.location.LocationManager.KEY_LOCATION_CHANGED"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/location/LocationManager.html#KEY_LOCATION_CHANGED" target="_top"><xfont size="+1"><tt>KEY_LOCATION_CHANGED</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.location.LocationManager.KEY_PROVIDER_ENABLED"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/location/LocationManager.html#KEY_PROVIDER_ENABLED" target="_top"><xfont size="+1"><tt>KEY_PROVIDER_ENABLED</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.location.LocationManager.KEY_STATUS_CHANGED"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/location/LocationManager.html#KEY_STATUS_CHANGED" target="_top"><xfont size="+1"><tt>KEY_STATUS_CHANGED</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.media.AudioManager.html b/docs/html/sdk/api_diff/3/changes/android.media.AudioManager.html
new file mode 100644
index 000000000000..a98d840ffaf7
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.media.AudioManager.html
@@ -0,0 +1,227 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.media.AudioManager
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.media.<A HREF="../../../../reference/android/media/AudioManager.html" target="_top"><font size="+3"><tt>AudioManager</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.media.AudioManager.isBluetoothA2dpOn_added()"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/media/AudioManager.html#isBluetoothA2dpOn()" target="_top"><xfont size="+1"><tt>isBluetoothA2dpOn</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.media.AudioManager.playSoundEffect_added(int, float)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/media/AudioManager.html#playSoundEffect(int, float)" target="_top"><xfont size="+1"><tt>playSoundEffect</tt></font></A>(<code>int,</nobr> float<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.media.AudioManager.setBluetoothA2dpOn_added(boolean)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/media/AudioManager.html#setBluetoothA2dpOn(boolean)" target="_top"><xfont size="+1"><tt>setBluetoothA2dpOn</tt></font></A>(<code>boolean</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.media.AudioManager.ACTION_AUDIO_BECOMING_NOISY"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/media/AudioManager.html#ACTION_AUDIO_BECOMING_NOISY" target="_top"><xfont size="+1"><tt>ACTION_AUDIO_BECOMING_NOISY</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.media.AudioManager.FX_KEYPRESS_DELETE"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/media/AudioManager.html#FX_KEYPRESS_DELETE" target="_top"><xfont size="+1"><tt>FX_KEYPRESS_DELETE</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.media.AudioManager.FX_KEYPRESS_RETURN"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/media/AudioManager.html#FX_KEYPRESS_RETURN" target="_top"><xfont size="+1"><tt>FX_KEYPRESS_RETURN</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.media.AudioManager.FX_KEYPRESS_SPACEBAR"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/media/AudioManager.html#FX_KEYPRESS_SPACEBAR" target="_top"><xfont size="+1"><tt>FX_KEYPRESS_SPACEBAR</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.media.AudioManager.FX_KEYPRESS_STANDARD"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/media/AudioManager.html#FX_KEYPRESS_STANDARD" target="_top"><xfont size="+1"><tt>FX_KEYPRESS_STANDARD</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.media.AudioManager.ROUTE_BLUETOOTH_A2DP"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/media/AudioManager.html#ROUTE_BLUETOOTH_A2DP" target="_top"><xfont size="+1"><tt>ROUTE_BLUETOOTH_A2DP</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.media.AudioManager.ROUTE_BLUETOOTH_SCO"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/media/AudioManager.html#ROUTE_BLUETOOTH_SCO" target="_top"><xfont size="+1"><tt>ROUTE_BLUETOOTH_SCO</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.media.AudioManager.STREAM_NOTIFICATION"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/media/AudioManager.html#STREAM_NOTIFICATION" target="_top"><xfont size="+1"><tt>STREAM_NOTIFICATION</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=3>Changed Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.media.AudioManager.NUM_STREAMS"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/media/AudioManager.html#NUM_STREAMS" target="_top"><xfont size="+1"><tt>NUM_STREAMS</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.media.AudioManager.ROUTE_BLUETOOTH"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/media/AudioManager.html#ROUTE_BLUETOOTH" target="_top"><xfont size="+1"><tt>ROUTE_BLUETOOTH</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.media.MediaPlayer.html b/docs/html/sdk/api_diff/3/changes/android.media.MediaPlayer.html
new file mode 100644
index 000000000000..7704e1232ee8
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.media.MediaPlayer.html
@@ -0,0 +1,180 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.media.MediaPlayer
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.media.<A HREF="../../../../reference/android/media/MediaPlayer.html" target="_top"><font size="+3"><tt>MediaPlayer</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.media.MediaPlayer.isLooping_added()"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/media/MediaPlayer.html#isLooping()" target="_top"><xfont size="+1"><tt>isLooping</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.media.MediaPlayer.setOnInfoListener_added(android.media.MediaPlayer.OnInfoListener)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/media/MediaPlayer.html#setOnInfoListener(android.media.MediaPlayer.OnInfoListener)" target="_top"><xfont size="+1"><tt>setOnInfoListener</tt></font></A>(<code>OnInfoListener</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.media.MediaPlayer.setOnVideoSizeChangedListener_added(android.media.MediaPlayer.OnVideoSizeChangedListener)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/media/MediaPlayer.html#setOnVideoSizeChangedListener(android.media.MediaPlayer.OnVideoSizeChangedListener)" target="_top"><xfont size="+1"><tt>setOnVideoSizeChangedListener</tt></font></A>(<code>OnVideoSizeChangedListener</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.media.MediaPlayer.MEDIA_ERROR_NOT_VALID_FOR_PROGRESSIVE_PLAYBACK"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/media/MediaPlayer.html#MEDIA_ERROR_NOT_VALID_FOR_PROGRESSIVE_PLAYBACK" target="_top"><xfont size="+1"><tt>MEDIA_ERROR_NOT_VALID_FOR_PROGRESSIVE_PLAYBACK</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.media.MediaPlayer.MEDIA_INFO_BAD_INTERLEAVING"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/media/MediaPlayer.html#MEDIA_INFO_BAD_INTERLEAVING" target="_top"><xfont size="+1"><tt>MEDIA_INFO_BAD_INTERLEAVING</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.media.MediaPlayer.MEDIA_INFO_NOT_SEEKABLE"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/media/MediaPlayer.html#MEDIA_INFO_NOT_SEEKABLE" target="_top"><xfont size="+1"><tt>MEDIA_INFO_NOT_SEEKABLE</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.media.MediaPlayer.MEDIA_INFO_UNKNOWN"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/media/MediaPlayer.html#MEDIA_INFO_UNKNOWN" target="_top"><xfont size="+1"><tt>MEDIA_INFO_UNKNOWN</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.media.MediaPlayer.MEDIA_INFO_VIDEO_TRACK_LAGGING"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/media/MediaPlayer.html#MEDIA_INFO_VIDEO_TRACK_LAGGING" target="_top"><xfont size="+1"><tt>MEDIA_INFO_VIDEO_TRACK_LAGGING</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.media.MediaRecorder.OutputFormat.html b/docs/html/sdk/api_diff/3/changes/android.media.MediaRecorder.OutputFormat.html
new file mode 100644
index 000000000000..0967c567c7f4
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.media.MediaRecorder.OutputFormat.html
@@ -0,0 +1,123 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.media.MediaRecorder.OutputFormat
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.media.<A HREF="../../../../reference/android/media/MediaRecorder.OutputFormat.html" target="_top"><font size="+3"><tt>MediaRecorder.OutputFormat</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<a NAME="fields"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.media.MediaRecorder.OutputFormat.RAW_AMR"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/media/MediaRecorder.OutputFormat.html#RAW_AMR" target="_top"><xfont size="+1"><tt>RAW_AMR</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.media.MediaRecorder.html b/docs/html/sdk/api_diff/3/changes/android.media.MediaRecorder.html
new file mode 100644
index 000000000000..9daf4c350aaa
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.media.MediaRecorder.html
@@ -0,0 +1,240 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.media.MediaRecorder
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.media.<A HREF="../../../../reference/android/media/MediaRecorder.html" target="_top"><font size="+3"><tt>MediaRecorder</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.media.MediaRecorder.setCamera_added(android.hardware.Camera)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/media/MediaRecorder.html#setCamera(android.hardware.Camera)" target="_top"><xfont size="+1"><tt>setCamera</tt></font></A>(<code>Camera</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.media.MediaRecorder.setMaxDuration_added(int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/media/MediaRecorder.html#setMaxDuration(int)" target="_top"><xfont size="+1"><tt>setMaxDuration</tt></font></A>(<code>int</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.media.MediaRecorder.setMaxFileSize_added(long)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/media/MediaRecorder.html#setMaxFileSize(long)" target="_top"><xfont size="+1"><tt>setMaxFileSize</tt></font></A>(<code>long</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.media.MediaRecorder.setOnErrorListener_added(android.media.MediaRecorder.OnErrorListener)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/media/MediaRecorder.html#setOnErrorListener(android.media.MediaRecorder.OnErrorListener)" target="_top"><xfont size="+1"><tt>setOnErrorListener</tt></font></A>(<code>OnErrorListener</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.media.MediaRecorder.setOnInfoListener_added(android.media.MediaRecorder.OnInfoListener)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/media/MediaRecorder.html#setOnInfoListener(android.media.MediaRecorder.OnInfoListener)" target="_top"><xfont size="+1"><tt>setOnInfoListener</tt></font></A>(<code>OnInfoListener</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.media.MediaRecorder.setOutputFile_added(java.io.FileDescriptor)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/media/MediaRecorder.html#setOutputFile(java.io.FileDescriptor)" target="_top"><xfont size="+1"><tt>setOutputFile</tt></font></A>(<code>FileDescriptor</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.media.MediaRecorder.setVideoEncoder_added(int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/media/MediaRecorder.html#setVideoEncoder(int)" target="_top"><xfont size="+1"><tt>setVideoEncoder</tt></font></A>(<code>int</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.media.MediaRecorder.setVideoFrameRate_added(int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/media/MediaRecorder.html#setVideoFrameRate(int)" target="_top"><xfont size="+1"><tt>setVideoFrameRate</tt></font></A>(<code>int</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.media.MediaRecorder.setVideoSize_added(int, int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/media/MediaRecorder.html#setVideoSize(int, int)" target="_top"><xfont size="+1"><tt>setVideoSize</tt></font></A>(<code>int,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.media.MediaRecorder.setVideoSource_added(int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/media/MediaRecorder.html#setVideoSource(int)" target="_top"><xfont size="+1"><tt>setVideoSource</tt></font></A>(<code>int</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=3>Changed Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.media.MediaRecorder.prepare_changed()"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/media/MediaRecorder.html#prepare()" target="_top"><xfont size="+1"><tt>prepare</tt></font></A>()  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+Change in exceptions thrown from <code>java.lang.IllegalStateException</code> to (<code>java.io.IOException, java.lang.IllegalStateException</code>).<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.media.MediaRecorder.MEDIA_RECORDER_ERROR_UNKNOWN"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/media/MediaRecorder.html#MEDIA_RECORDER_ERROR_UNKNOWN" target="_top"><xfont size="+1"><tt>MEDIA_RECORDER_ERROR_UNKNOWN</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.media.MediaRecorder.MEDIA_RECORDER_INFO_MAX_DURATION_REACHED"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/media/MediaRecorder.html#MEDIA_RECORDER_INFO_MAX_DURATION_REACHED" target="_top"><xfont size="+1"><tt>MEDIA_RECORDER_INFO_MAX_DURATION_REACHED</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.media.MediaRecorder.MEDIA_RECORDER_INFO_MAX_FILESIZE_REACHED"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/media/MediaRecorder.html#MEDIA_RECORDER_INFO_MAX_FILESIZE_REACHED" target="_top"><xfont size="+1"><tt>MEDIA_RECORDER_INFO_MAX_FILESIZE_REACHED</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.media.MediaRecorder.MEDIA_RECORDER_INFO_UNKNOWN"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/media/MediaRecorder.html#MEDIA_RECORDER_INFO_UNKNOWN" target="_top"><xfont size="+1"><tt>MEDIA_RECORDER_INFO_UNKNOWN</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.media.RingtoneManager.html b/docs/html/sdk/api_diff/3/changes/android.media.RingtoneManager.html
new file mode 100644
index 000000000000..e9fdbfc24b04
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.media.RingtoneManager.html
@@ -0,0 +1,123 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.media.RingtoneManager
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.media.<A HREF="../../../../reference/android/media/RingtoneManager.html" target="_top"><font size="+3"><tt>RingtoneManager</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.media.RingtoneManager.inferStreamType_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/media/RingtoneManager.html#inferStreamType()" target="_top"><xfont size="+1"><tt>inferStreamType</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.media.SoundPool.html b/docs/html/sdk/api_diff/3/changes/android.media.SoundPool.html
new file mode 100644
index 000000000000..6e765d837f78
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.media.SoundPool.html
@@ -0,0 +1,130 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.media.SoundPool
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.media.<A HREF="../../../../reference/android/media/SoundPool.html" target="_top"><font size="+3"><tt>SoundPool</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.media.SoundPool.load_added(android.content.res.AssetFileDescriptor, int)"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/media/SoundPool.html#load(android.content.res.AssetFileDescriptor, int)" target="_top"><xfont size="+1"><tt>load</tt></font></A>(<code>AssetFileDescriptor,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.media.SoundPool.load_added(java.io.FileDescriptor, long, long, int)"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/media/SoundPool.html#load(java.io.FileDescriptor, long, long, int)" target="_top"><xfont size="+1"><tt>load</tt></font></A>(<code>FileDescriptor,</nobr> long<nobr>,</nobr> long<nobr>,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.net.ConnectivityManager.html b/docs/html/sdk/api_diff/3/changes/android.net.ConnectivityManager.html
new file mode 100644
index 000000000000..7b0750e02f15
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.net.ConnectivityManager.html
@@ -0,0 +1,138 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.net.ConnectivityManager
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.net.<A HREF="../../../../reference/android/net/ConnectivityManager.html" target="_top"><font size="+3"><tt>ConnectivityManager</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.net.ConnectivityManager.getBackgroundDataSetting_added()"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/net/ConnectivityManager.html#getBackgroundDataSetting()" target="_top"><xfont size="+1"><tt>getBackgroundDataSetting</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.net.ConnectivityManager.ACTION_BACKGROUND_DATA_SETTING_CHANGED"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/net/ConnectivityManager.html#ACTION_BACKGROUND_DATA_SETTING_CHANGED" target="_top"><xfont size="+1"><tt>ACTION_BACKGROUND_DATA_SETTING_CHANGED</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.net.NetworkInfo.html b/docs/html/sdk/api_diff/3/changes/android.net.NetworkInfo.html
new file mode 100644
index 000000000000..6c3c26d2c4c4
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.net.NetworkInfo.html
@@ -0,0 +1,152 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.net.NetworkInfo
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.net.<A HREF="../../../../reference/android/net/NetworkInfo.html" target="_top"><font size="+3"><tt>NetworkInfo</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<p>
+<a NAME="Removed"></a>
+<TABLE summary="Removed Constructors" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Removed Constructors</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.net.NetworkInfo.ctor_removed(int)"></A>
+  <nobr>NetworkInfo(<code>int</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.net.NetworkInfo.getSubtype_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/net/NetworkInfo.html#getSubtype()" target="_top"><xfont size="+1"><tt>getSubtype</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.net.NetworkInfo.getSubtypeName_added()"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/net/NetworkInfo.html#getSubtypeName()" target="_top"><xfont size="+1"><tt>getSubtypeName</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.net.NetworkInfo.isRoaming_added()"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/net/NetworkInfo.html#isRoaming()" target="_top"><xfont size="+1"><tt>isRoaming</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.net.wifi.WifiManager.html b/docs/html/sdk/api_diff/3/changes/android.net.wifi.WifiManager.html
new file mode 100644
index 000000000000..2e79642e7662
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.net.wifi.WifiManager.html
@@ -0,0 +1,145 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.net.wifi.WifiManager
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.net.wifi.<A HREF="../../../../reference/android/net/wifi/WifiManager.html" target="_top"><font size="+3"><tt>WifiManager</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.net.wifi.WifiManager.createWifiLock_added(int, java.lang.String)"></A>
+  <nobr><code>WifiLock</code>&nbsp;<A HREF="../../../../reference/android/net/wifi/WifiManager.html#createWifiLock(int, java.lang.String)" target="_top"><xfont size="+1"><tt>createWifiLock</tt></font></A>(<code>int,</nobr> String<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.net.wifi.WifiManager.WIFI_MODE_FULL"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/net/wifi/WifiManager.html#WIFI_MODE_FULL" target="_top"><xfont size="+1"><tt>WIFI_MODE_FULL</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.net.wifi.WifiManager.WIFI_MODE_SCAN_ONLY"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/net/wifi/WifiManager.html#WIFI_MODE_SCAN_ONLY" target="_top"><xfont size="+1"><tt>WIFI_MODE_SCAN_ONLY</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.os.Binder.html b/docs/html/sdk/api_diff/3/changes/android.os.Binder.html
new file mode 100644
index 000000000000..882803adaf42
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.os.Binder.html
@@ -0,0 +1,123 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.os.Binder
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.os.<A HREF="../../../../reference/android/os/Binder.html" target="_top"><font size="+3"><tt>Binder</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.os.Binder.dump_added(java.io.FileDescriptor, java.lang.String[])"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/os/Binder.html#dump(java.io.FileDescriptor, java.lang.String[])" target="_top"><xfont size="+1"><tt>dump</tt></font></A>(<code>FileDescriptor,</nobr> String[]<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.os.Build.html b/docs/html/sdk/api_diff/3/changes/android.os.Build.html
new file mode 100644
index 000000000000..2a69a8c7c204
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.os.Build.html
@@ -0,0 +1,123 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.os.Build
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.os.<A HREF="../../../../reference/android/os/Build.html" target="_top"><font size="+3"><tt>Build</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<a NAME="fields"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.os.Build.DISPLAY"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/os/Build.html#DISPLAY" target="_top"><xfont size="+1"><tt>DISPLAY</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.os.Debug.html b/docs/html/sdk/api_diff/3/changes/android.os.Debug.html
new file mode 100644
index 000000000000..8e7e2db3eef8
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.os.Debug.html
@@ -0,0 +1,141 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.os.Debug
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.os.<A HREF="../../../../reference/android/os/Debug.html" target="_top"><font size="+3"><tt>Debug</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.os.Debug.dumpHprofData_added(java.lang.String)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/os/Debug.html#dumpHprofData(java.lang.String)" target="_top"><xfont size="+1"><tt>dumpHprofData</tt></font></A>(<code>String</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=3>Changed Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.os.Debug.changeDebugPort_changed(int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/os/Debug.html#changeDebugPort(int)" target="_top"><xfont size="+1"><tt>changeDebugPort</tt></font></A>(<code>int</code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.os.Environment.html b/docs/html/sdk/api_diff/3/changes/android.os.Environment.html
new file mode 100644
index 000000000000..4cc764375c64
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.os.Environment.html
@@ -0,0 +1,130 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.os.Environment
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.os.<A HREF="../../../../reference/android/os/Environment.html" target="_top"><font size="+3"><tt>Environment</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<a NAME="fields"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.os.Environment.MEDIA_CHECKING"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/os/Environment.html#MEDIA_CHECKING" target="_top"><xfont size="+1"><tt>MEDIA_CHECKING</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.os.Environment.MEDIA_NOFS"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/os/Environment.html#MEDIA_NOFS" target="_top"><xfont size="+1"><tt>MEDIA_NOFS</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.os.Handler.html b/docs/html/sdk/api_diff/3/changes/android.os.Handler.html
new file mode 100644
index 000000000000..fc10c9b29cd1
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.os.Handler.html
@@ -0,0 +1,130 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.os.Handler
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.os.<A HREF="../../../../reference/android/os/Handler.html" target="_top"><font size="+3"><tt>Handler</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Constructors" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Constructors</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.os.Handler.ctor_added(android.os.Handler.Callback)"></A>
+  <nobr><A HREF="../../../../reference/android/os/Handler.html#Handler(android.os.Handler.Callback)" target="_top"><xfont size="+1"><tt>Handler</tt></font></A>(<code>Callback</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.os.Handler.ctor_added(android.os.Looper, android.os.Handler.Callback)"></A>
+  <nobr><A HREF="../../../../reference/android/os/Handler.html#Handler(android.os.Looper, android.os.Handler.Callback)" target="_top"><xfont size="+1"><tt>Handler</tt></font></A>(<code>Looper,</nobr> Callback<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="methods"></a>
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.os.IBinder.html b/docs/html/sdk/api_diff/3/changes/android.os.IBinder.html
new file mode 100644
index 000000000000..95745dc7d4a3
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.os.IBinder.html
@@ -0,0 +1,123 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.os.IBinder
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Interface android.os.<A HREF="../../../../reference/android/os/IBinder.html" target="_top"><font size="+3"><tt>IBinder</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.os.IBinder.dump_added(java.io.FileDescriptor, java.lang.String[])"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/os/IBinder.html#dump(java.io.FileDescriptor, java.lang.String[])" target="_top"><xfont size="+1"><tt>dump</tt></font></A>(<code>FileDescriptor,</nobr> String[]<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.os.Looper.html b/docs/html/sdk/api_diff/3/changes/android.os.Looper.html
new file mode 100644
index 000000000000..d79ae756786f
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.os.Looper.html
@@ -0,0 +1,123 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.os.Looper
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.os.<A HREF="../../../../reference/android/os/Looper.html" target="_top"><font size="+3"><tt>Looper</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.os.Looper.getThread_added()"></A>
+  <nobr><code>Thread</code>&nbsp;<A HREF="../../../../reference/android/os/Looper.html#getThread()" target="_top"><xfont size="+1"><tt>getThread</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.os.Parcel.html b/docs/html/sdk/api_diff/3/changes/android.os.Parcel.html
new file mode 100644
index 000000000000..317b722d9f0f
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.os.Parcel.html
@@ -0,0 +1,146 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.os.Parcel
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.os.<A HREF="../../../../reference/android/os/Parcel.html" target="_top"><font size="+3"><tt>Parcel</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=3>Changed Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.os.Parcel.readHashMap_changed(java.lang.ClassLoader)"></A>
+  <nobr><code>HashMap</code>&nbsp;<A HREF="../../../../reference/android/os/Parcel.html#readHashMap(java.lang.ClassLoader)" target="_top"><xfont size="+1"><tt>readHashMap</tt></font></A>(<code>ClassLoader</code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+Change from deprecated to undeprecated.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.os.Parcel.readMap_changed(java.util.Map, java.lang.ClassLoader)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/os/Parcel.html#readMap(java.util.Map, java.lang.ClassLoader)" target="_top"><xfont size="+1"><tt>readMap</tt></font></A>(<code>Map,</nobr> ClassLoader<nobr><nobr></code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+Change from deprecated to undeprecated.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.os.Parcel.writeMap_changed(java.util.Map)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/os/Parcel.html#writeMap(java.util.Map)" target="_top"><xfont size="+1"><tt>writeMap</tt></font></A>(<code>Map</code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+Change from deprecated to undeprecated.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.os.ParcelFileDescriptor.html b/docs/html/sdk/api_diff/3/changes/android.os.ParcelFileDescriptor.html
new file mode 100644
index 000000000000..77641d54c4dd
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.os.ParcelFileDescriptor.html
@@ -0,0 +1,138 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.os.ParcelFileDescriptor
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.os.<A HREF="../../../../reference/android/os/ParcelFileDescriptor.html" target="_top"><font size="+3"><tt>ParcelFileDescriptor</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.os.ParcelFileDescriptor.getStatSize_added()"></A>
+  <nobr><code>long</code>&nbsp;<A HREF="../../../../reference/android/os/ParcelFileDescriptor.html#getStatSize()" target="_top"><xfont size="+1"><tt>getStatSize</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.os.ParcelFileDescriptor.MODE_APPEND"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/os/ParcelFileDescriptor.html#MODE_APPEND" target="_top"><xfont size="+1"><tt>MODE_APPEND</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.preference.DialogPreference.html b/docs/html/sdk/api_diff/3/changes/android.preference.DialogPreference.html
new file mode 100644
index 000000000000..93e05e7c6320
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.preference.DialogPreference.html
@@ -0,0 +1,123 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.preference.DialogPreference
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.preference.<A HREF="../../../../reference/android/preference/DialogPreference.html" target="_top"><font size="+3"><tt>DialogPreference</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.preference.DialogPreference.getDialog_added()"></A>
+  <nobr><code>Dialog</code>&nbsp;<A HREF="../../../../reference/android/preference/DialogPreference.html#getDialog()" target="_top"><xfont size="+1"><tt>getDialog</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.provider.Browser.html b/docs/html/sdk/api_diff/3/changes/android.provider.Browser.html
new file mode 100644
index 000000000000..9a9a4b80ef09
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.provider.Browser.html
@@ -0,0 +1,123 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.provider.Browser
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.provider.<A HREF="../../../../reference/android/provider/Browser.html" target="_top"><font size="+3"><tt>Browser</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<a NAME="fields"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Browser.EXTRA_APPLICATION_ID"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Browser.html#EXTRA_APPLICATION_ID" target="_top"><xfont size="+1"><tt>EXTRA_APPLICATION_ID</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.provider.Contacts.Intents.Insert.html b/docs/html/sdk/api_diff/3/changes/android.provider.Contacts.Intents.Insert.html
new file mode 100644
index 000000000000..32541826a888
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.provider.Contacts.Intents.Insert.html
@@ -0,0 +1,179 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.provider.Contacts.Intents.Insert
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.provider.<A HREF="../../../../reference/android/provider/Contacts.Intents.Insert.html" target="_top"><font size="+3"><tt>Contacts.Intents.Insert</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<a NAME="fields"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Contacts.Intents.Insert.PHONETIC_NAME"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Contacts.Intents.Insert.html#PHONETIC_NAME" target="_top"><xfont size="+1"><tt>PHONETIC_NAME</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Contacts.Intents.Insert.SECONDARY_EMAIL"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Contacts.Intents.Insert.html#SECONDARY_EMAIL" target="_top"><xfont size="+1"><tt>SECONDARY_EMAIL</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Contacts.Intents.Insert.SECONDARY_EMAIL_TYPE"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Contacts.Intents.Insert.html#SECONDARY_EMAIL_TYPE" target="_top"><xfont size="+1"><tt>SECONDARY_EMAIL_TYPE</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Contacts.Intents.Insert.SECONDARY_PHONE"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Contacts.Intents.Insert.html#SECONDARY_PHONE" target="_top"><xfont size="+1"><tt>SECONDARY_PHONE</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Contacts.Intents.Insert.SECONDARY_PHONE_TYPE"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Contacts.Intents.Insert.html#SECONDARY_PHONE_TYPE" target="_top"><xfont size="+1"><tt>SECONDARY_PHONE_TYPE</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Contacts.Intents.Insert.TERTIARY_EMAIL"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Contacts.Intents.Insert.html#TERTIARY_EMAIL" target="_top"><xfont size="+1"><tt>TERTIARY_EMAIL</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Contacts.Intents.Insert.TERTIARY_EMAIL_TYPE"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Contacts.Intents.Insert.html#TERTIARY_EMAIL_TYPE" target="_top"><xfont size="+1"><tt>TERTIARY_EMAIL_TYPE</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Contacts.Intents.Insert.TERTIARY_PHONE"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Contacts.Intents.Insert.html#TERTIARY_PHONE" target="_top"><xfont size="+1"><tt>TERTIARY_PHONE</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Contacts.Intents.Insert.TERTIARY_PHONE_TYPE"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Contacts.Intents.Insert.html#TERTIARY_PHONE_TYPE" target="_top"><xfont size="+1"><tt>TERTIARY_PHONE_TYPE</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.provider.Contacts.Intents.html b/docs/html/sdk/api_diff/3/changes/android.provider.Contacts.Intents.html
new file mode 100644
index 000000000000..1f758333c47e
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.provider.Contacts.Intents.html
@@ -0,0 +1,137 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.provider.Contacts.Intents
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.provider.<A HREF="../../../../reference/android/provider/Contacts.Intents.html" target="_top"><font size="+3"><tt>Contacts.Intents</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<a NAME="fields"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Contacts.Intents.EXTRA_CREATE_DESCRIPTION"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Contacts.Intents.html#EXTRA_CREATE_DESCRIPTION" target="_top"><xfont size="+1"><tt>EXTRA_CREATE_DESCRIPTION</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Contacts.Intents.EXTRA_FORCE_CREATE"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Contacts.Intents.html#EXTRA_FORCE_CREATE" target="_top"><xfont size="+1"><tt>EXTRA_FORCE_CREATE</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Contacts.Intents.SHOW_OR_CREATE_CONTACT"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Contacts.Intents.html#SHOW_OR_CREATE_CONTACT" target="_top"><xfont size="+1"><tt>SHOW_OR_CREATE_CONTACT</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.provider.Contacts.PeopleColumns.html b/docs/html/sdk/api_diff/3/changes/android.provider.Contacts.PeopleColumns.html
new file mode 100644
index 000000000000..e8c0f4d6d2c7
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.provider.Contacts.PeopleColumns.html
@@ -0,0 +1,123 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.provider.Contacts.PeopleColumns
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Interface android.provider.<A HREF="../../../../reference/android/provider/Contacts.PeopleColumns.html" target="_top"><font size="+3"><tt>Contacts.PeopleColumns</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<a NAME="fields"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Contacts.PeopleColumns.PHONETIC_NAME"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Contacts.PeopleColumns.html#PHONETIC_NAME" target="_top"><xfont size="+1"><tt>PHONETIC_NAME</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.provider.MediaStore.Audio.AlbumColumns.html b/docs/html/sdk/api_diff/3/changes/android.provider.MediaStore.Audio.AlbumColumns.html
new file mode 100644
index 000000000000..ade1498b3082
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.provider.MediaStore.Audio.AlbumColumns.html
@@ -0,0 +1,123 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.provider.MediaStore.Audio.AlbumColumns
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Interface android.provider.<A HREF="../../../../reference/android/provider/MediaStore.Audio.AlbumColumns.html" target="_top"><font size="+3"><tt>MediaStore.Audio.AlbumColumns</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<a NAME="fields"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.MediaStore.Audio.AlbumColumns.NUMBER_OF_SONGS_FOR_ARTIST"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/MediaStore.Audio.AlbumColumns.html#NUMBER_OF_SONGS_FOR_ARTIST" target="_top"><xfont size="+1"><tt>NUMBER_OF_SONGS_FOR_ARTIST</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.provider.MediaStore.Audio.Media.html b/docs/html/sdk/api_diff/3/changes/android.provider.MediaStore.Audio.Media.html
new file mode 100644
index 000000000000..52bae9d6f275
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.provider.MediaStore.Audio.Media.html
@@ -0,0 +1,123 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.provider.MediaStore.Audio.Media
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.provider.<A HREF="../../../../reference/android/provider/MediaStore.Audio.Media.html" target="_top"><font size="+3"><tt>MediaStore.Audio.Media</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<a NAME="fields"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.MediaStore.Audio.Media.EXTRA_MAX_BYTES"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/MediaStore.Audio.Media.html#EXTRA_MAX_BYTES" target="_top"><xfont size="+1"><tt>EXTRA_MAX_BYTES</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.provider.MediaStore.Images.Media.html b/docs/html/sdk/api_diff/3/changes/android.provider.MediaStore.Images.Media.html
new file mode 100644
index 000000000000..b375c3f9959f
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.provider.MediaStore.Images.Media.html
@@ -0,0 +1,125 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.provider.MediaStore.Images.Media
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.provider.<A HREF="../../../../reference/android/provider/MediaStore.Images.Media.html" target="_top"><font size="+3"><tt>MediaStore.Images.Media</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<a NAME="fields"></a>
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=3>Changed Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.MediaStore.Images.Media.DEFAULT_SORT_ORDER"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/MediaStore.Images.Media.html#DEFAULT_SORT_ORDER" target="_top"><xfont size="+1"><tt>DEFAULT_SORT_ORDER</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+Changed in value from "name ASC" to "bucket_display_name".
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.provider.MediaStore.Video.VideoColumns.html b/docs/html/sdk/api_diff/3/changes/android.provider.MediaStore.Video.VideoColumns.html
new file mode 100644
index 000000000000..43494502563f
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.provider.MediaStore.Video.VideoColumns.html
@@ -0,0 +1,137 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.provider.MediaStore.Video.VideoColumns
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Interface android.provider.<A HREF="../../../../reference/android/provider/MediaStore.Video.VideoColumns.html" target="_top"><font size="+3"><tt>MediaStore.Video.VideoColumns</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<a NAME="fields"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.MediaStore.Video.VideoColumns.BOOKMARK"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/MediaStore.Video.VideoColumns.html#BOOKMARK" target="_top"><xfont size="+1"><tt>BOOKMARK</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.MediaStore.Video.VideoColumns.BUCKET_DISPLAY_NAME"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/MediaStore.Video.VideoColumns.html#BUCKET_DISPLAY_NAME" target="_top"><xfont size="+1"><tt>BUCKET_DISPLAY_NAME</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.MediaStore.Video.VideoColumns.BUCKET_ID"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/MediaStore.Video.VideoColumns.html#BUCKET_ID" target="_top"><xfont size="+1"><tt>BUCKET_ID</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.provider.MediaStore.Video.html b/docs/html/sdk/api_diff/3/changes/android.provider.MediaStore.Video.html
new file mode 100644
index 000000000000..60437625988c
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.provider.MediaStore.Video.html
@@ -0,0 +1,125 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.provider.MediaStore.Video
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.provider.<A HREF="../../../../reference/android/provider/MediaStore.Video.html" target="_top"><font size="+3"><tt>MediaStore.Video</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<a NAME="fields"></a>
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=3>Changed Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.MediaStore.Video.DEFAULT_SORT_ORDER"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/MediaStore.Video.html#DEFAULT_SORT_ORDER" target="_top"><xfont size="+1"><tt>DEFAULT_SORT_ORDER</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+Changed in value from "name ASC" to "_display_name".
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.provider.MediaStore.html b/docs/html/sdk/api_diff/3/changes/android.provider.MediaStore.html
new file mode 100644
index 000000000000..0d6a4cdce690
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.provider.MediaStore.html
@@ -0,0 +1,207 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.provider.MediaStore
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.provider.<A HREF="../../../../reference/android/provider/MediaStore.html" target="_top"><font size="+3"><tt>MediaStore</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<a NAME="fields"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.MediaStore.ACTION_IMAGE_CAPTURE"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/MediaStore.html#ACTION_IMAGE_CAPTURE" target="_top"><xfont size="+1"><tt>ACTION_IMAGE_CAPTURE</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.MediaStore.ACTION_VIDEO_CAPTURE"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/MediaStore.html#ACTION_VIDEO_CAPTURE" target="_top"><xfont size="+1"><tt>ACTION_VIDEO_CAPTURE</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.MediaStore.EXTRA_FINISH_ON_COMPLETION"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/MediaStore.html#EXTRA_FINISH_ON_COMPLETION" target="_top"><xfont size="+1"><tt>EXTRA_FINISH_ON_COMPLETION</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.MediaStore.EXTRA_MEDIA_ALBUM"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/MediaStore.html#EXTRA_MEDIA_ALBUM" target="_top"><xfont size="+1"><tt>EXTRA_MEDIA_ALBUM</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.MediaStore.EXTRA_MEDIA_ARTIST"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/MediaStore.html#EXTRA_MEDIA_ARTIST" target="_top"><xfont size="+1"><tt>EXTRA_MEDIA_ARTIST</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.MediaStore.EXTRA_MEDIA_FOCUS"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/MediaStore.html#EXTRA_MEDIA_FOCUS" target="_top"><xfont size="+1"><tt>EXTRA_MEDIA_FOCUS</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.MediaStore.EXTRA_MEDIA_TITLE"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/MediaStore.html#EXTRA_MEDIA_TITLE" target="_top"><xfont size="+1"><tt>EXTRA_MEDIA_TITLE</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.MediaStore.EXTRA_OUTPUT"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/MediaStore.html#EXTRA_OUTPUT" target="_top"><xfont size="+1"><tt>EXTRA_OUTPUT</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.MediaStore.EXTRA_SCREEN_ORIENTATION"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/MediaStore.html#EXTRA_SCREEN_ORIENTATION" target="_top"><xfont size="+1"><tt>EXTRA_SCREEN_ORIENTATION</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.MediaStore.EXTRA_VIDEO_QUALITY"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/MediaStore.html#EXTRA_VIDEO_QUALITY" target="_top"><xfont size="+1"><tt>EXTRA_VIDEO_QUALITY</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.MediaStore.INTENT_ACTION_MEDIA_SEARCH"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/MediaStore.html#INTENT_ACTION_MEDIA_SEARCH" target="_top"><xfont size="+1"><tt>INTENT_ACTION_MEDIA_SEARCH</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/MediaStore.html#INTENT_ACTION_STILL_IMAGE_CAMERA" target="_top"><xfont size="+1"><tt>INTENT_ACTION_STILL_IMAGE_CAMERA</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.MediaStore.INTENT_ACTION_VIDEO_CAMERA"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/MediaStore.html#INTENT_ACTION_VIDEO_CAMERA" target="_top"><xfont size="+1"><tt>INTENT_ACTION_VIDEO_CAMERA</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.provider.Settings.System.html b/docs/html/sdk/api_diff/3/changes/android.provider.Settings.System.html
new file mode 100644
index 000000000000..b7ef86c6695a
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.provider.Settings.System.html
@@ -0,0 +1,502 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.provider.Settings.System
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.provider.<A HREF="../../../../reference/android/provider/Settings.System.html" target="_top"><font size="+3"><tt>Settings.System</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Settings.System.getLong_added(android.content.ContentResolver, java.lang.String)"></A>
+  <nobr><code>long</code>&nbsp;<A HREF="../../../../reference/android/provider/Settings.System.html#getLong(android.content.ContentResolver, java.lang.String)" target="_top"><xfont size="+1"><tt>getLong</tt></font></A>(<code>ContentResolver,</nobr> String<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Settings.System.getLong_added(android.content.ContentResolver, java.lang.String, long)"></A>
+  <nobr><code>long</code>&nbsp;<A HREF="../../../../reference/android/provider/Settings.System.html#getLong(android.content.ContentResolver, java.lang.String, long)" target="_top"><xfont size="+1"><tt>getLong</tt></font></A>(<code>ContentResolver,</nobr> String<nobr>,</nobr> long<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Settings.System.putLong_added(android.content.ContentResolver, java.lang.String, long)"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/provider/Settings.System.html#putLong(android.content.ContentResolver, java.lang.String, long)" target="_top"><xfont size="+1"><tt>putLong</tt></font></A>(<code>ContentResolver,</nobr> String<nobr>,</nobr> long<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Settings.System.ACCELEROMETER_ROTATION"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Settings.System.html#ACCELEROMETER_ROTATION" target="_top"><xfont size="+1"><tt>ACCELEROMETER_ROTATION</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Settings.System.HAPTIC_FEEDBACK_ENABLED"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Settings.System.html#HAPTIC_FEEDBACK_ENABLED" target="_top"><xfont size="+1"><tt>HAPTIC_FEEDBACK_ENABLED</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Settings.System.LOCK_PATTERN_TACTILE_FEEDBACK_ENABLED"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Settings.System.html#LOCK_PATTERN_TACTILE_FEEDBACK_ENABLED" target="_top"><xfont size="+1"><tt>LOCK_PATTERN_TACTILE_FEEDBACK_ENABLED</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Settings.System.VOLUME_NOTIFICATION"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Settings.System.html#VOLUME_NOTIFICATION" target="_top"><xfont size="+1"><tt>VOLUME_NOTIFICATION</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Settings.System.WIFI_MAX_DHCP_RETRY_COUNT"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Settings.System.html#WIFI_MAX_DHCP_RETRY_COUNT" target="_top"><xfont size="+1"><tt>WIFI_MAX_DHCP_RETRY_COUNT</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Settings.System.WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Settings.System.html#WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS" target="_top"><xfont size="+1"><tt>WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Settings.System.WIFI_SLEEP_POLICY"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Settings.System.html#WIFI_SLEEP_POLICY" target="_top"><xfont size="+1"><tt>WIFI_SLEEP_POLICY</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Settings.System.WIFI_SLEEP_POLICY_DEFAULT"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/provider/Settings.System.html#WIFI_SLEEP_POLICY_DEFAULT" target="_top"><xfont size="+1"><tt>WIFI_SLEEP_POLICY_DEFAULT</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Settings.System.WIFI_SLEEP_POLICY_NEVER"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/provider/Settings.System.html#WIFI_SLEEP_POLICY_NEVER" target="_top"><xfont size="+1"><tt>WIFI_SLEEP_POLICY_NEVER</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Settings.System.WIFI_SLEEP_POLICY_NEVER_WHILE_PLUGGED"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/provider/Settings.System.html#WIFI_SLEEP_POLICY_NEVER_WHILE_PLUGGED" target="_top"><xfont size="+1"><tt>WIFI_SLEEP_POLICY_NEVER_WHILE_PLUGGED</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=3>Changed Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Settings.System.ADB_ENABLED"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Settings.System.html#ADB_ENABLED" target="_top"><xfont size="+1"><tt>ADB_ENABLED</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Settings.System.ANDROID_ID"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Settings.System.html#ANDROID_ID" target="_top"><xfont size="+1"><tt>ANDROID_ID</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Settings.System.BLUETOOTH_ON"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Settings.System.html#BLUETOOTH_ON" target="_top"><xfont size="+1"><tt>BLUETOOTH_ON</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Settings.System.DATA_ROAMING"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Settings.System.html#DATA_ROAMING" target="_top"><xfont size="+1"><tt>DATA_ROAMING</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Settings.System.DEVICE_PROVISIONED"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Settings.System.html#DEVICE_PROVISIONED" target="_top"><xfont size="+1"><tt>DEVICE_PROVISIONED</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Settings.System.HTTP_PROXY"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Settings.System.html#HTTP_PROXY" target="_top"><xfont size="+1"><tt>HTTP_PROXY</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Settings.System.INSTALL_NON_MARKET_APPS"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Settings.System.html#INSTALL_NON_MARKET_APPS" target="_top"><xfont size="+1"><tt>INSTALL_NON_MARKET_APPS</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Settings.System.LOCATION_PROVIDERS_ALLOWED"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Settings.System.html#LOCATION_PROVIDERS_ALLOWED" target="_top"><xfont size="+1"><tt>LOCATION_PROVIDERS_ALLOWED</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Settings.System.LOGGING_ID"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Settings.System.html#LOGGING_ID" target="_top"><xfont size="+1"><tt>LOGGING_ID</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Settings.System.NETWORK_PREFERENCE"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Settings.System.html#NETWORK_PREFERENCE" target="_top"><xfont size="+1"><tt>NETWORK_PREFERENCE</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Settings.System.PARENTAL_CONTROL_ENABLED"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Settings.System.html#PARENTAL_CONTROL_ENABLED" target="_top"><xfont size="+1"><tt>PARENTAL_CONTROL_ENABLED</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Settings.System.PARENTAL_CONTROL_LAST_UPDATE"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Settings.System.html#PARENTAL_CONTROL_LAST_UPDATE" target="_top"><xfont size="+1"><tt>PARENTAL_CONTROL_LAST_UPDATE</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Settings.System.PARENTAL_CONTROL_REDIRECT_URL"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Settings.System.html#PARENTAL_CONTROL_REDIRECT_URL" target="_top"><xfont size="+1"><tt>PARENTAL_CONTROL_REDIRECT_URL</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Settings.System.SETTINGS_CLASSNAME"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Settings.System.html#SETTINGS_CLASSNAME" target="_top"><xfont size="+1"><tt>SETTINGS_CLASSNAME</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Settings.System.USB_MASS_STORAGE_ENABLED"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Settings.System.html#USB_MASS_STORAGE_ENABLED" target="_top"><xfont size="+1"><tt>USB_MASS_STORAGE_ENABLED</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Settings.System.USE_GOOGLE_MAIL"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Settings.System.html#USE_GOOGLE_MAIL" target="_top"><xfont size="+1"><tt>USE_GOOGLE_MAIL</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Settings.System.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Settings.System.html#WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON" target="_top"><xfont size="+1"><tt>WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Settings.System.WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Settings.System.html#WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY" target="_top"><xfont size="+1"><tt>WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Settings.System.WIFI_NUM_OPEN_NETWORKS_KEPT"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Settings.System.html#WIFI_NUM_OPEN_NETWORKS_KEPT" target="_top"><xfont size="+1"><tt>WIFI_NUM_OPEN_NETWORKS_KEPT</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Settings.System.WIFI_ON"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Settings.System.html#WIFI_ON" target="_top"><xfont size="+1"><tt>WIFI_ON</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Settings.System.WIFI_WATCHDOG_ACCEPTABLE_PACKET_LOSS_PERCENTAGE"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Settings.System.html#WIFI_WATCHDOG_ACCEPTABLE_PACKET_LOSS_PERCENTAGE" target="_top"><xfont size="+1"><tt>WIFI_WATCHDOG_ACCEPTABLE_PACKET_LOSS_PERCENTAGE</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Settings.System.WIFI_WATCHDOG_AP_COUNT"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Settings.System.html#WIFI_WATCHDOG_AP_COUNT" target="_top"><xfont size="+1"><tt>WIFI_WATCHDOG_AP_COUNT</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Settings.System.WIFI_WATCHDOG_BACKGROUND_CHECK_DELAY_MS"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Settings.System.html#WIFI_WATCHDOG_BACKGROUND_CHECK_DELAY_MS" target="_top"><xfont size="+1"><tt>WIFI_WATCHDOG_BACKGROUND_CHECK_DELAY_MS</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Settings.System.WIFI_WATCHDOG_BACKGROUND_CHECK_ENABLED"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Settings.System.html#WIFI_WATCHDOG_BACKGROUND_CHECK_ENABLED" target="_top"><xfont size="+1"><tt>WIFI_WATCHDOG_BACKGROUND_CHECK_ENABLED</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Settings.System.WIFI_WATCHDOG_BACKGROUND_CHECK_TIMEOUT_MS"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Settings.System.html#WIFI_WATCHDOG_BACKGROUND_CHECK_TIMEOUT_MS" target="_top"><xfont size="+1"><tt>WIFI_WATCHDOG_BACKGROUND_CHECK_TIMEOUT_MS</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Settings.System.WIFI_WATCHDOG_INITIAL_IGNORED_PING_COUNT"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Settings.System.html#WIFI_WATCHDOG_INITIAL_IGNORED_PING_COUNT" target="_top"><xfont size="+1"><tt>WIFI_WATCHDOG_INITIAL_IGNORED_PING_COUNT</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Settings.System.WIFI_WATCHDOG_MAX_AP_CHECKS"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Settings.System.html#WIFI_WATCHDOG_MAX_AP_CHECKS" target="_top"><xfont size="+1"><tt>WIFI_WATCHDOG_MAX_AP_CHECKS</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Settings.System.WIFI_WATCHDOG_ON"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Settings.System.html#WIFI_WATCHDOG_ON" target="_top"><xfont size="+1"><tt>WIFI_WATCHDOG_ON</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Settings.System.WIFI_WATCHDOG_PING_COUNT"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Settings.System.html#WIFI_WATCHDOG_PING_COUNT" target="_top"><xfont size="+1"><tt>WIFI_WATCHDOG_PING_COUNT</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Settings.System.WIFI_WATCHDOG_PING_DELAY_MS"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Settings.System.html#WIFI_WATCHDOG_PING_DELAY_MS" target="_top"><xfont size="+1"><tt>WIFI_WATCHDOG_PING_DELAY_MS</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Settings.System.WIFI_WATCHDOG_PING_TIMEOUT_MS"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Settings.System.html#WIFI_WATCHDOG_PING_TIMEOUT_MS" target="_top"><xfont size="+1"><tt>WIFI_WATCHDOG_PING_TIMEOUT_MS</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.provider.Settings.html b/docs/html/sdk/api_diff/3/changes/android.provider.Settings.html
new file mode 100644
index 000000000000..227b462ed957
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.provider.Settings.html
@@ -0,0 +1,200 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.provider.Settings
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.provider.<A HREF="../../../../reference/android/provider/Settings.html" target="_top"><font size="+3"><tt>Settings</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<a NAME="fields"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Settings.ACTION_AIRPLANE_MODE_SETTINGS"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Settings.html#ACTION_AIRPLANE_MODE_SETTINGS" target="_top"><xfont size="+1"><tt>ACTION_AIRPLANE_MODE_SETTINGS</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Settings.ACTION_APPLICATION_DEVELOPMENT_SETTINGS"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Settings.html#ACTION_APPLICATION_DEVELOPMENT_SETTINGS" target="_top"><xfont size="+1"><tt>ACTION_APPLICATION_DEVELOPMENT_SETTINGS</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Settings.ACTION_DATA_ROAMING_SETTINGS"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Settings.html#ACTION_DATA_ROAMING_SETTINGS" target="_top"><xfont size="+1"><tt>ACTION_DATA_ROAMING_SETTINGS</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Settings.ACTION_INPUT_METHOD_SETTINGS"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Settings.html#ACTION_INPUT_METHOD_SETTINGS" target="_top"><xfont size="+1"><tt>ACTION_INPUT_METHOD_SETTINGS</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Settings.ACTION_INTERNAL_STORAGE_SETTINGS"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Settings.html#ACTION_INTERNAL_STORAGE_SETTINGS" target="_top"><xfont size="+1"><tt>ACTION_INTERNAL_STORAGE_SETTINGS</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Settings.ACTION_MANAGE_APPLICATIONS_SETTINGS"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Settings.html#ACTION_MANAGE_APPLICATIONS_SETTINGS" target="_top"><xfont size="+1"><tt>ACTION_MANAGE_APPLICATIONS_SETTINGS</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Settings.ACTION_MEMORY_CARD_SETTINGS"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Settings.html#ACTION_MEMORY_CARD_SETTINGS" target="_top"><xfont size="+1"><tt>ACTION_MEMORY_CARD_SETTINGS</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Settings.ACTION_NETWORK_OPERATOR_SETTINGS"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Settings.html#ACTION_NETWORK_OPERATOR_SETTINGS" target="_top"><xfont size="+1"><tt>ACTION_NETWORK_OPERATOR_SETTINGS</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Settings.ACTION_QUICK_LAUNCH_SETTINGS"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Settings.html#ACTION_QUICK_LAUNCH_SETTINGS" target="_top"><xfont size="+1"><tt>ACTION_QUICK_LAUNCH_SETTINGS</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Settings.ACTION_SYNC_SETTINGS"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Settings.html#ACTION_SYNC_SETTINGS" target="_top"><xfont size="+1"><tt>ACTION_SYNC_SETTINGS</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Settings.ACTION_USER_DICTIONARY_SETTINGS"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Settings.html#ACTION_USER_DICTIONARY_SETTINGS" target="_top"><xfont size="+1"><tt>ACTION_USER_DICTIONARY_SETTINGS</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider.Settings.ACTION_WIFI_IP_SETTINGS"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/provider/Settings.html#ACTION_WIFI_IP_SETTINGS" target="_top"><xfont size="+1"><tt>ACTION_WIFI_IP_SETTINGS</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.telephony.PhoneNumberUtils.html b/docs/html/sdk/api_diff/3/changes/android.telephony.PhoneNumberUtils.html
new file mode 100644
index 000000000000..6e0b240ca75b
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.telephony.PhoneNumberUtils.html
@@ -0,0 +1,138 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.telephony.PhoneNumberUtils
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.telephony.<A HREF="../../../../reference/android/telephony/PhoneNumberUtils.html" target="_top"><font size="+3"><tt>PhoneNumberUtils</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.telephony.PhoneNumberUtils.formatJapaneseNumber_added(android.text.Editable)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/telephony/PhoneNumberUtils.html#formatJapaneseNumber(android.text.Editable)" target="_top"><xfont size="+1"><tt>formatJapaneseNumber</tt></font></A>(<code>Editable</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.telephony.PhoneNumberUtils.FORMAT_JAPAN"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/telephony/PhoneNumberUtils.html#FORMAT_JAPAN" target="_top"><xfont size="+1"><tt>FORMAT_JAPAN</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.telephony.TelephonyManager.html b/docs/html/sdk/api_diff/3/changes/android.telephony.TelephonyManager.html
new file mode 100644
index 000000000000..aa02f5c1f3a8
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.telephony.TelephonyManager.html
@@ -0,0 +1,173 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.telephony.TelephonyManager
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.telephony.<A HREF="../../../../reference/android/telephony/TelephonyManager.html" target="_top"><font size="+3"><tt>TelephonyManager</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.telephony.TelephonyManager.getNeighboringCellInfo_added()"></A>
+  <nobr><code>List&lt;NeighboringCellInfo&gt;</code>&nbsp;<A HREF="../../../../reference/android/telephony/TelephonyManager.html#getNeighboringCellInfo()" target="_top"><xfont size="+1"><tt>getNeighboringCellInfo</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.telephony.TelephonyManager.ACTION_PHONE_STATE_CHANGED"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/telephony/TelephonyManager.html#ACTION_PHONE_STATE_CHANGED" target="_top"><xfont size="+1"><tt>ACTION_PHONE_STATE_CHANGED</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.telephony.TelephonyManager.EXTRA_INCOMING_NUMBER"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/telephony/TelephonyManager.html#EXTRA_INCOMING_NUMBER" target="_top"><xfont size="+1"><tt>EXTRA_INCOMING_NUMBER</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.telephony.TelephonyManager.EXTRA_STATE"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/telephony/TelephonyManager.html#EXTRA_STATE" target="_top"><xfont size="+1"><tt>EXTRA_STATE</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.telephony.TelephonyManager.EXTRA_STATE_IDLE"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/telephony/TelephonyManager.html#EXTRA_STATE_IDLE" target="_top"><xfont size="+1"><tt>EXTRA_STATE_IDLE</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.telephony.TelephonyManager.EXTRA_STATE_OFFHOOK"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/telephony/TelephonyManager.html#EXTRA_STATE_OFFHOOK" target="_top"><xfont size="+1"><tt>EXTRA_STATE_OFFHOOK</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.telephony.TelephonyManager.EXTRA_STATE_RINGING"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/telephony/TelephonyManager.html#EXTRA_STATE_RINGING" target="_top"><xfont size="+1"><tt>EXTRA_STATE_RINGING</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.telephony.gsm.SmsMessage.html b/docs/html/sdk/api_diff/3/changes/android.telephony.gsm.SmsMessage.html
new file mode 100644
index 000000000000..c6069043fe40
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.telephony.gsm.SmsMessage.html
@@ -0,0 +1,123 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.telephony.gsm.SmsMessage
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.telephony.gsm.<A HREF="../../../../reference/android/telephony/gsm/SmsMessage.html" target="_top"><font size="+3"><tt>SmsMessage</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.telephony.gsm.SmsMessage.calculateLength_added(java.lang.CharSequence, boolean)"></A>
+  <nobr><code>int[]</code>&nbsp;<A HREF="../../../../reference/android/telephony/gsm/SmsMessage.html#calculateLength(java.lang.CharSequence, boolean)" target="_top"><xfont size="+1"><tt>calculateLength</tt></font></A>(<code>CharSequence,</nobr> boolean<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.test.ActivityInstrumentationTestCase.html b/docs/html/sdk/api_diff/3/changes/android.test.ActivityInstrumentationTestCase.html
new file mode 100644
index 000000000000..c3360776828e
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.test.ActivityInstrumentationTestCase.html
@@ -0,0 +1,109 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.test.ActivityInstrumentationTestCase
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.test.<A HREF="../../../../reference/android/test/ActivityInstrumentationTestCase.html" target="_top"><font size="+3"><tt>ActivityInstrumentationTestCase</tt></font></A>
+</H2>
+<p><b>Now deprecated</b>.<br>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.test.InstrumentationTestCase.html b/docs/html/sdk/api_diff/3/changes/android.test.InstrumentationTestCase.html
new file mode 100644
index 000000000000..1fb403aaabe5
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.test.InstrumentationTestCase.html
@@ -0,0 +1,130 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.test.InstrumentationTestCase
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.test.<A HREF="../../../../reference/android/test/InstrumentationTestCase.html" target="_top"><font size="+3"><tt>InstrumentationTestCase</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.test.InstrumentationTestCase.launchActivityWithIntent_added(java.lang.String, java.lang.Class<T>, android.content.Intent)"></A>
+  <nobr><code>T</code>&nbsp;<A HREF="../../../../reference/android/test/InstrumentationTestCase.html#launchActivityWithIntent(java.lang.String, java.lang.Class<T>, android.content.Intent)" target="_top"><xfont size="+1"><tt>launchActivityWithIntent</tt></font></A>(<code>String,</nobr> Class&lt;T&gt;<nobr>,</nobr> Intent<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.test.InstrumentationTestCase.runTestOnUiThread_added(java.lang.Runnable)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/test/InstrumentationTestCase.html#runTestOnUiThread(java.lang.Runnable)" target="_top"><xfont size="+1"><tt>runTestOnUiThread</tt></font></A>(<code>Runnable</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.test.ProviderTestCase.html b/docs/html/sdk/api_diff/3/changes/android.test.ProviderTestCase.html
new file mode 100644
index 000000000000..ffbee6091afe
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.test.ProviderTestCase.html
@@ -0,0 +1,109 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.test.ProviderTestCase
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.test.<A HREF="../../../../reference/android/test/ProviderTestCase.html" target="_top"><font size="+3"><tt>ProviderTestCase</tt></font></A>
+</H2>
+<p><b>Now deprecated</b>.<br>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.test.TouchUtils.html b/docs/html/sdk/api_diff/3/changes/android.test.TouchUtils.html
new file mode 100644
index 000000000000..75f9e5e03e2a
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.test.TouchUtils.html
@@ -0,0 +1,362 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.test.TouchUtils
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.test.<A HREF="../../../../reference/android/test/TouchUtils.html" target="_top"><font size="+3"><tt>TouchUtils</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.test.TouchUtils.drag_added(android.test.InstrumentationTestCase, float, float, float, float, int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/test/TouchUtils.html#drag(android.test.InstrumentationTestCase, float, float, float, float, int)" target="_top"><xfont size="+1"><tt>drag</tt></font></A>(<code>InstrumentationTestCase,</nobr> float<nobr>,</nobr> float<nobr>,</nobr> float<nobr>,</nobr> float<nobr>,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.test.TouchUtils.dragQuarterScreenDown_added(android.test.InstrumentationTestCase, android.app.Activity)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/test/TouchUtils.html#dragQuarterScreenDown(android.test.InstrumentationTestCase, android.app.Activity)" target="_top"><xfont size="+1"><tt>dragQuarterScreenDown</tt></font></A>(<code>InstrumentationTestCase,</nobr> Activity<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.test.TouchUtils.dragQuarterScreenUp_added(android.test.InstrumentationTestCase, android.app.Activity)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/test/TouchUtils.html#dragQuarterScreenUp(android.test.InstrumentationTestCase, android.app.Activity)" target="_top"><xfont size="+1"><tt>dragQuarterScreenUp</tt></font></A>(<code>InstrumentationTestCase,</nobr> Activity<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.test.TouchUtils.dragViewBy_added(android.test.InstrumentationTestCase, android.view.View, int, int, int)"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/test/TouchUtils.html#dragViewBy(android.test.InstrumentationTestCase, android.view.View, int, int, int)" target="_top"><xfont size="+1"><tt>dragViewBy</tt></font></A>(<code>InstrumentationTestCase,</nobr> View<nobr>,</nobr> int<nobr>,</nobr> int<nobr>,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.test.TouchUtils.dragViewTo_added(android.test.InstrumentationTestCase, android.view.View, int, int, int)"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/test/TouchUtils.html#dragViewTo(android.test.InstrumentationTestCase, android.view.View, int, int, int)" target="_top"><xfont size="+1"><tt>dragViewTo</tt></font></A>(<code>InstrumentationTestCase,</nobr> View<nobr>,</nobr> int<nobr>,</nobr> int<nobr>,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.test.TouchUtils.dragViewToBottom_added(android.test.ActivityInstrumentationTestCase, android.view.View, int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/test/TouchUtils.html#dragViewToBottom(android.test.ActivityInstrumentationTestCase, android.view.View, int)" target="_top"><xfont size="+1"><tt>dragViewToBottom</tt></font></A>(<code>ActivityInstrumentationTestCase,</nobr> View<nobr>,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.test.TouchUtils.dragViewToBottom_added(android.test.InstrumentationTestCase, android.app.Activity, android.view.View, int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/test/TouchUtils.html#dragViewToBottom(android.test.InstrumentationTestCase, android.app.Activity, android.view.View, int)" target="_top"><xfont size="+1"><tt>dragViewToBottom</tt></font></A>(<code>InstrumentationTestCase,</nobr> Activity<nobr>,</nobr> View<nobr>,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.test.TouchUtils.dragViewToTop_added(android.test.InstrumentationTestCase, android.view.View)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/test/TouchUtils.html#dragViewToTop(android.test.InstrumentationTestCase, android.view.View)" target="_top"><xfont size="+1"><tt>dragViewToTop</tt></font></A>(<code>InstrumentationTestCase,</nobr> View<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.test.TouchUtils.dragViewToTop_added(android.test.InstrumentationTestCase, android.view.View, int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/test/TouchUtils.html#dragViewToTop(android.test.InstrumentationTestCase, android.view.View, int)" target="_top"><xfont size="+1"><tt>dragViewToTop</tt></font></A>(<code>InstrumentationTestCase,</nobr> View<nobr>,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.test.TouchUtils.dragViewToX_added(android.test.InstrumentationTestCase, android.view.View, int, int)"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/test/TouchUtils.html#dragViewToX(android.test.InstrumentationTestCase, android.view.View, int, int)" target="_top"><xfont size="+1"><tt>dragViewToX</tt></font></A>(<code>InstrumentationTestCase,</nobr> View<nobr>,</nobr> int<nobr>,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.test.TouchUtils.dragViewToY_added(android.test.InstrumentationTestCase, android.view.View, int, int)"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/test/TouchUtils.html#dragViewToY(android.test.InstrumentationTestCase, android.view.View, int, int)" target="_top"><xfont size="+1"><tt>dragViewToY</tt></font></A>(<code>InstrumentationTestCase,</nobr> View<nobr>,</nobr> int<nobr>,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.test.TouchUtils.longClickView_added(android.test.InstrumentationTestCase, android.view.View)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/test/TouchUtils.html#longClickView(android.test.InstrumentationTestCase, android.view.View)" target="_top"><xfont size="+1"><tt>longClickView</tt></font></A>(<code>InstrumentationTestCase,</nobr> View<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.test.TouchUtils.scrollToBottom_added(android.test.InstrumentationTestCase, android.app.Activity, android.view.ViewGroup)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/test/TouchUtils.html#scrollToBottom(android.test.InstrumentationTestCase, android.app.Activity, android.view.ViewGroup)" target="_top"><xfont size="+1"><tt>scrollToBottom</tt></font></A>(<code>InstrumentationTestCase,</nobr> Activity<nobr>,</nobr> ViewGroup<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.test.TouchUtils.scrollToTop_added(android.test.InstrumentationTestCase, android.app.Activity, android.view.ViewGroup)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/test/TouchUtils.html#scrollToTop(android.test.InstrumentationTestCase, android.app.Activity, android.view.ViewGroup)" target="_top"><xfont size="+1"><tt>scrollToTop</tt></font></A>(<code>InstrumentationTestCase,</nobr> Activity<nobr>,</nobr> ViewGroup<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=3>Changed Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.test.TouchUtils.drag_changed(android.test.ActivityInstrumentationTestCase, float, float, float, float, int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/test/TouchUtils.html#drag(android.test.ActivityInstrumentationTestCase, float, float, float, float, int)" target="_top"><xfont size="+1"><tt>drag</tt></font></A>(<code>ActivityInstrumentationTestCase,</nobr> float<nobr>,</nobr> float<nobr>,</nobr> float<nobr>,</nobr> float<nobr>,</nobr> int<nobr><nobr></code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.test.TouchUtils.dragQuarterScreenDown_changed(android.test.ActivityInstrumentationTestCase)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/test/TouchUtils.html#dragQuarterScreenDown(android.test.ActivityInstrumentationTestCase)" target="_top"><xfont size="+1"><tt>dragQuarterScreenDown</tt></font></A>(<code>ActivityInstrumentationTestCase</code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.test.TouchUtils.dragQuarterScreenUp_changed(android.test.ActivityInstrumentationTestCase)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/test/TouchUtils.html#dragQuarterScreenUp(android.test.ActivityInstrumentationTestCase)" target="_top"><xfont size="+1"><tt>dragQuarterScreenUp</tt></font></A>(<code>ActivityInstrumentationTestCase</code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.test.TouchUtils.dragViewBy_changed(android.test.ActivityInstrumentationTestCase, android.view.View, int, int, int)"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/test/TouchUtils.html#dragViewBy(android.test.ActivityInstrumentationTestCase, android.view.View, int, int, int)" target="_top"><xfont size="+1"><tt>dragViewBy</tt></font></A>(<code>ActivityInstrumentationTestCase,</nobr> View<nobr>,</nobr> int<nobr>,</nobr> int<nobr>,</nobr> int<nobr><nobr></code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.test.TouchUtils.dragViewTo_changed(android.test.ActivityInstrumentationTestCase, android.view.View, int, int, int)"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/test/TouchUtils.html#dragViewTo(android.test.ActivityInstrumentationTestCase, android.view.View, int, int, int)" target="_top"><xfont size="+1"><tt>dragViewTo</tt></font></A>(<code>ActivityInstrumentationTestCase,</nobr> View<nobr>,</nobr> int<nobr>,</nobr> int<nobr>,</nobr> int<nobr><nobr></code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.test.TouchUtils.dragViewToBottom_changed(android.test.ActivityInstrumentationTestCase, android.view.View)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/test/TouchUtils.html#dragViewToBottom(android.test.ActivityInstrumentationTestCase, android.view.View)" target="_top"><xfont size="+1"><tt>dragViewToBottom</tt></font></A>(<code>ActivityInstrumentationTestCase,</nobr> View<nobr><nobr></code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.test.TouchUtils.dragViewToBottom_changed(android.test.InstrumentationTestCase, android.app.Activity, android.view.View)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/test/TouchUtils.html#dragViewToBottom(android.test.InstrumentationTestCase, android.app.Activity, android.view.View)" target="_top"><xfont size="+1"><tt>dragViewToBottom</tt></font></A>(<code>InstrumentationTestCase,</nobr> Activity<nobr>,</nobr> View<nobr><nobr></code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+Change in signature from (<code>ActivityInstrumentationTestCase, View, int</code>) to (<code>InstrumentationTestCase, Activity, View</code>).<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.test.TouchUtils.dragViewToTop_changed(android.test.ActivityInstrumentationTestCase, android.view.View)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/test/TouchUtils.html#dragViewToTop(android.test.ActivityInstrumentationTestCase, android.view.View)" target="_top"><xfont size="+1"><tt>dragViewToTop</tt></font></A>(<code>ActivityInstrumentationTestCase,</nobr> View<nobr><nobr></code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.test.TouchUtils.dragViewToTop_changed(android.test.ActivityInstrumentationTestCase, android.view.View, int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/test/TouchUtils.html#dragViewToTop(android.test.ActivityInstrumentationTestCase, android.view.View, int)" target="_top"><xfont size="+1"><tt>dragViewToTop</tt></font></A>(<code>ActivityInstrumentationTestCase,</nobr> View<nobr>,</nobr> int<nobr><nobr></code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.test.TouchUtils.dragViewToX_changed(android.test.ActivityInstrumentationTestCase, android.view.View, int, int)"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/test/TouchUtils.html#dragViewToX(android.test.ActivityInstrumentationTestCase, android.view.View, int, int)" target="_top"><xfont size="+1"><tt>dragViewToX</tt></font></A>(<code>ActivityInstrumentationTestCase,</nobr> View<nobr>,</nobr> int<nobr>,</nobr> int<nobr><nobr></code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.test.TouchUtils.dragViewToY_changed(android.test.ActivityInstrumentationTestCase, android.view.View, int, int)"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/test/TouchUtils.html#dragViewToY(android.test.ActivityInstrumentationTestCase, android.view.View, int, int)" target="_top"><xfont size="+1"><tt>dragViewToY</tt></font></A>(<code>ActivityInstrumentationTestCase,</nobr> View<nobr>,</nobr> int<nobr>,</nobr> int<nobr><nobr></code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.test.TouchUtils.longClickView_changed(android.test.ActivityInstrumentationTestCase, android.view.View)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/test/TouchUtils.html#longClickView(android.test.ActivityInstrumentationTestCase, android.view.View)" target="_top"><xfont size="+1"><tt>longClickView</tt></font></A>(<code>ActivityInstrumentationTestCase,</nobr> View<nobr><nobr></code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.test.TouchUtils.scrollToBottom_changed(android.test.ActivityInstrumentationTestCase, android.view.ViewGroup)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/test/TouchUtils.html#scrollToBottom(android.test.ActivityInstrumentationTestCase, android.view.ViewGroup)" target="_top"><xfont size="+1"><tt>scrollToBottom</tt></font></A>(<code>ActivityInstrumentationTestCase,</nobr> ViewGroup<nobr><nobr></code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.test.TouchUtils.scrollToTop_changed(android.test.ActivityInstrumentationTestCase, android.view.ViewGroup)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/test/TouchUtils.html#scrollToTop(android.test.ActivityInstrumentationTestCase, android.view.ViewGroup)" target="_top"><xfont size="+1"><tt>scrollToTop</tt></font></A>(<code>ActivityInstrumentationTestCase,</nobr> ViewGroup<nobr><nobr></code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.test.mock.MockPackageManager.html b/docs/html/sdk/api_diff/3/changes/android.test.mock.MockPackageManager.html
new file mode 100644
index 000000000000..8e727f35f6b8
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.test.mock.MockPackageManager.html
@@ -0,0 +1,137 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.test.mock.MockPackageManager
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.test.mock.<A HREF="../../../../reference/android/test/mock/MockPackageManager.html" target="_top"><font size="+3"><tt>MockPackageManager</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.test.mock.MockPackageManager.getLaunchIntentForPackage_added(java.lang.String)"></A>
+  <nobr><code>Intent</code>&nbsp;<A HREF="../../../../reference/android/test/mock/MockPackageManager.html#getLaunchIntentForPackage(java.lang.String)" target="_top"><xfont size="+1"><tt>getLaunchIntentForPackage</tt></font></A>(<code>String</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.test.mock.MockPackageManager.getSystemSharedLibraryNames_added()"></A>
+  <nobr><code>String[]</code>&nbsp;<A HREF="../../../../reference/android/test/mock/MockPackageManager.html#getSystemSharedLibraryNames()" target="_top"><xfont size="+1"><tt>getSystemSharedLibraryNames</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.test.mock.MockPackageManager.isSafeMode_added()"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/test/mock/MockPackageManager.html#isSafeMode()" target="_top"><xfont size="+1"><tt>isSafeMode</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.test.suitebuilder.TestMethod.html b/docs/html/sdk/api_diff/3/changes/android.test.suitebuilder.TestMethod.html
new file mode 100644
index 000000000000..52467f3fbb2f
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.test.suitebuilder.TestMethod.html
@@ -0,0 +1,130 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.test.suitebuilder.TestMethod
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.test.suitebuilder.<A HREF="../../../../reference/android/test/suitebuilder/TestMethod.html" target="_top"><font size="+3"><tt>TestMethod</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Constructors" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Constructors</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.test.suitebuilder.TestMethod.ctor_added(java.lang.String, java.lang.Class<? extends junit.framework.TestCase>)"></A>
+  <nobr><A HREF="../../../../reference/android/test/suitebuilder/TestMethod.html#TestMethod(java.lang.String, java.lang.Class<? extends junit.framework.TestCase>)" target="_top"><xfont size="+1"><tt>TestMethod</tt></font></A>(<code>String,</nobr> Class&lt;TestCase&gt;<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.test.suitebuilder.TestMethod.ctor_added(junit.framework.TestCase)"></A>
+  <nobr><A HREF="../../../../reference/android/test/suitebuilder/TestMethod.html#TestMethod(junit.framework.TestCase)" target="_top"><xfont size="+1"><tt>TestMethod</tt></font></A>(<code>TestCase</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="methods"></a>
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.test.suitebuilder.TestSuiteBuilder.html b/docs/html/sdk/api_diff/3/changes/android.test.suitebuilder.TestSuiteBuilder.html
new file mode 100644
index 000000000000..548f473b72f5
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.test.suitebuilder.TestSuiteBuilder.html
@@ -0,0 +1,126 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.test.suitebuilder.TestSuiteBuilder
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.test.suitebuilder.<A HREF="../../../../reference/android/test/suitebuilder/TestSuiteBuilder.html" target="_top"><font size="+3"><tt>TestSuiteBuilder</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=3>Changed Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.test.suitebuilder.TestSuiteBuilder.addRequirements_changed(com.android.internal.util.Predicate<android.test.suitebuilder.TestMethod>...)"></A>
+  <nobr><code>TestSuiteBuilder</code>&nbsp;<A HREF="../../../../reference/android/test/suitebuilder/TestSuiteBuilder.html#addRequirements(com.android.internal.util.Predicate<android.test.suitebuilder.TestMethod>...)" target="_top"><xfont size="+1"><tt>addRequirements</tt></font></A>(<code>Predicate&lt;TestMethod&gt;</code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+Change in signature from <code>void</code> to <code>Predicate&lt;TestMethod&gt;</code>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.text.Annotation.html b/docs/html/sdk/api_diff/3/changes/android.text.Annotation.html
new file mode 100644
index 000000000000..863f172ffa65
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.text.Annotation.html
@@ -0,0 +1,153 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.text.Annotation
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.text.<A HREF="../../../../reference/android/text/Annotation.html" target="_top"><font size="+3"><tt>Annotation</tt></font></A>
+</H2>
+<p><font xsize="+1">Added interface <code>android.text.ParcelableSpan</code>.<br></font>
+<a NAME="constructors"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Constructors" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Constructors</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.Annotation.ctor_added(android.os.Parcel)"></A>
+  <nobr><A HREF="../../../../reference/android/text/Annotation.html#Annotation(android.os.Parcel)" target="_top"><xfont size="+1"><tt>Annotation</tt></font></A>(<code>Parcel</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.Annotation.describeContents_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/Annotation.html#describeContents()" target="_top"><xfont size="+1"><tt>describeContents</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.Annotation.getSpanTypeId_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/Annotation.html#getSpanTypeId()" target="_top"><xfont size="+1"><tt>getSpanTypeId</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.Annotation.writeToParcel_added(android.os.Parcel, int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/text/Annotation.html#writeToParcel(android.os.Parcel, int)" target="_top"><xfont size="+1"><tt>writeToParcel</tt></font></A>(<code>Parcel,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.text.AutoText.html b/docs/html/sdk/api_diff/3/changes/android.text.AutoText.html
new file mode 100644
index 000000000000..04ef46d33271
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.text.AutoText.html
@@ -0,0 +1,123 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.text.AutoText
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.text.<A HREF="../../../../reference/android/text/AutoText.html" target="_top"><font size="+3"><tt>AutoText</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.AutoText.getSize_added(android.view.View)"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/AutoText.html#getSize(android.view.View)" target="_top"><xfont size="+1"><tt>getSize</tt></font></A>(<code>View</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.text.SpanWatcher.html b/docs/html/sdk/api_diff/3/changes/android.text.SpanWatcher.html
new file mode 100644
index 000000000000..fd9943a56ff2
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.text.SpanWatcher.html
@@ -0,0 +1,109 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.text.SpanWatcher
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Interface android.text.<A HREF="../../../../reference/android/text/SpanWatcher.html" target="_top"><font size="+3"><tt>SpanWatcher</tt></font></A>
+</H2>
+<p><font xsize="+1">Added interface <code>android.text.NoCopySpan</code>.<br></font>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.text.Spanned.html b/docs/html/sdk/api_diff/3/changes/android.text.Spanned.html
new file mode 100644
index 000000000000..1c861979d671
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.text.Spanned.html
@@ -0,0 +1,137 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.text.Spanned
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Interface android.text.<A HREF="../../../../reference/android/text/Spanned.html" target="_top"><font size="+3"><tt>Spanned</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<a NAME="fields"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.Spanned.SPAN_COMPOSING"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/Spanned.html#SPAN_COMPOSING" target="_top"><xfont size="+1"><tt>SPAN_COMPOSING</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.Spanned.SPAN_INTERMEDIATE"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/Spanned.html#SPAN_INTERMEDIATE" target="_top"><xfont size="+1"><tt>SPAN_INTERMEDIATE</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.Spanned.SPAN_POINT_MARK_MASK"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/Spanned.html#SPAN_POINT_MARK_MASK" target="_top"><xfont size="+1"><tt>SPAN_POINT_MARK_MASK</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.text.TextUtils.html b/docs/html/sdk/api_diff/3/changes/android.text.TextUtils.html
new file mode 100644
index 000000000000..9fc8dae935ee
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.text.TextUtils.html
@@ -0,0 +1,159 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.text.TextUtils
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.text.<A HREF="../../../../reference/android/text/TextUtils.html" target="_top"><font size="+3"><tt>TextUtils</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.TextUtils.dumpSpans_added(java.lang.CharSequence, android.util.Printer, java.lang.String)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/text/TextUtils.html#dumpSpans(java.lang.CharSequence, android.util.Printer, java.lang.String)" target="_top"><xfont size="+1"><tt>dumpSpans</tt></font></A>(<code>CharSequence,</nobr> Printer<nobr>,</nobr> String<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.TextUtils.getCapsMode_added(java.lang.CharSequence, int, int)"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/TextUtils.html#getCapsMode(java.lang.CharSequence, int, int)" target="_top"><xfont size="+1"><tt>getCapsMode</tt></font></A>(<code>CharSequence,</nobr> int<nobr>,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.TextUtils.CAP_MODE_CHARACTERS"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/TextUtils.html#CAP_MODE_CHARACTERS" target="_top"><xfont size="+1"><tt>CAP_MODE_CHARACTERS</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.TextUtils.CAP_MODE_SENTENCES"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/TextUtils.html#CAP_MODE_SENTENCES" target="_top"><xfont size="+1"><tt>CAP_MODE_SENTENCES</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.TextUtils.CAP_MODE_WORDS"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/TextUtils.html#CAP_MODE_WORDS" target="_top"><xfont size="+1"><tt>CAP_MODE_WORDS</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.text.TextWatcher.html b/docs/html/sdk/api_diff/3/changes/android.text.TextWatcher.html
new file mode 100644
index 000000000000..a3856f851c10
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.text.TextWatcher.html
@@ -0,0 +1,109 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.text.TextWatcher
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Interface android.text.<A HREF="../../../../reference/android/text/TextWatcher.html" target="_top"><font size="+3"><tt>TextWatcher</tt></font></A>
+</H2>
+<p><font xsize="+1">Added interface <code>android.text.NoCopySpan</code>.<br></font>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.text.method.ArrowKeyMovementMethod.html b/docs/html/sdk/api_diff/3/changes/android.text.method.ArrowKeyMovementMethod.html
new file mode 100644
index 000000000000..6a1ce5eda080
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.text.method.ArrowKeyMovementMethod.html
@@ -0,0 +1,123 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.text.method.ArrowKeyMovementMethod
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.text.method.<A HREF="../../../../reference/android/text/method/ArrowKeyMovementMethod.html" target="_top"><font size="+3"><tt>ArrowKeyMovementMethod</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.method.ArrowKeyMovementMethod.onKeyOther_added(android.widget.TextView, android.text.Spannable, android.view.KeyEvent)"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/text/method/ArrowKeyMovementMethod.html#onKeyOther(android.widget.TextView, android.text.Spannable, android.view.KeyEvent)" target="_top"><xfont size="+1"><tt>onKeyOther</tt></font></A>(<code>TextView,</nobr> Spannable<nobr>,</nobr> KeyEvent<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.text.method.BaseKeyListener.html b/docs/html/sdk/api_diff/3/changes/android.text.method.BaseKeyListener.html
new file mode 100644
index 000000000000..b8dddc31cea3
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.text.method.BaseKeyListener.html
@@ -0,0 +1,123 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.text.method.BaseKeyListener
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.text.method.<A HREF="../../../../reference/android/text/method/BaseKeyListener.html" target="_top"><font size="+3"><tt>BaseKeyListener</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.method.BaseKeyListener.onKeyOther_added(android.view.View, android.text.Editable, android.view.KeyEvent)"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/text/method/BaseKeyListener.html#onKeyOther(android.view.View, android.text.Editable, android.view.KeyEvent)" target="_top"><xfont size="+1"><tt>onKeyOther</tt></font></A>(<code>View,</nobr> Editable<nobr>,</nobr> KeyEvent<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.text.method.DateKeyListener.html b/docs/html/sdk/api_diff/3/changes/android.text.method.DateKeyListener.html
new file mode 100644
index 000000000000..d49752c259cf
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.text.method.DateKeyListener.html
@@ -0,0 +1,123 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.text.method.DateKeyListener
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.text.method.<A HREF="../../../../reference/android/text/method/DateKeyListener.html" target="_top"><font size="+3"><tt>DateKeyListener</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.method.DateKeyListener.getInputType_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/method/DateKeyListener.html#getInputType()" target="_top"><xfont size="+1"><tt>getInputType</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.text.method.DateTimeKeyListener.html b/docs/html/sdk/api_diff/3/changes/android.text.method.DateTimeKeyListener.html
new file mode 100644
index 000000000000..82734d3833ef
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.text.method.DateTimeKeyListener.html
@@ -0,0 +1,123 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.text.method.DateTimeKeyListener
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.text.method.<A HREF="../../../../reference/android/text/method/DateTimeKeyListener.html" target="_top"><font size="+3"><tt>DateTimeKeyListener</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.method.DateTimeKeyListener.getInputType_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/method/DateTimeKeyListener.html#getInputType()" target="_top"><xfont size="+1"><tt>getInputType</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.text.method.DialerKeyListener.html b/docs/html/sdk/api_diff/3/changes/android.text.method.DialerKeyListener.html
new file mode 100644
index 000000000000..435e701ed689
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.text.method.DialerKeyListener.html
@@ -0,0 +1,123 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.text.method.DialerKeyListener
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.text.method.<A HREF="../../../../reference/android/text/method/DialerKeyListener.html" target="_top"><font size="+3"><tt>DialerKeyListener</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.method.DialerKeyListener.getInputType_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/method/DialerKeyListener.html#getInputType()" target="_top"><xfont size="+1"><tt>getInputType</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.text.method.DigitsKeyListener.html b/docs/html/sdk/api_diff/3/changes/android.text.method.DigitsKeyListener.html
new file mode 100644
index 000000000000..f33d5fe695bd
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.text.method.DigitsKeyListener.html
@@ -0,0 +1,123 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.text.method.DigitsKeyListener
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.text.method.<A HREF="../../../../reference/android/text/method/DigitsKeyListener.html" target="_top"><font size="+3"><tt>DigitsKeyListener</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.method.DigitsKeyListener.getInputType_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/method/DigitsKeyListener.html#getInputType()" target="_top"><xfont size="+1"><tt>getInputType</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.text.method.KeyListener.html b/docs/html/sdk/api_diff/3/changes/android.text.method.KeyListener.html
new file mode 100644
index 000000000000..2b24f03c022d
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.text.method.KeyListener.html
@@ -0,0 +1,137 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.text.method.KeyListener
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Interface android.text.method.<A HREF="../../../../reference/android/text/method/KeyListener.html" target="_top"><font size="+3"><tt>KeyListener</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.method.KeyListener.clearMetaKeyState_added(android.view.View, android.text.Editable, int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/text/method/KeyListener.html#clearMetaKeyState(android.view.View, android.text.Editable, int)" target="_top"><xfont size="+1"><tt>clearMetaKeyState</tt></font></A>(<code>View,</nobr> Editable<nobr>,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.method.KeyListener.getInputType_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/method/KeyListener.html#getInputType()" target="_top"><xfont size="+1"><tt>getInputType</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.method.KeyListener.onKeyOther_added(android.view.View, android.text.Editable, android.view.KeyEvent)"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/text/method/KeyListener.html#onKeyOther(android.view.View, android.text.Editable, android.view.KeyEvent)" target="_top"><xfont size="+1"><tt>onKeyOther</tt></font></A>(<code>View,</nobr> Editable<nobr>,</nobr> KeyEvent<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.text.method.MetaKeyKeyListener.html b/docs/html/sdk/api_diff/3/changes/android.text.method.MetaKeyKeyListener.html
new file mode 100644
index 000000000000..ecdedc1edb85
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.text.method.MetaKeyKeyListener.html
@@ -0,0 +1,186 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.text.method.MetaKeyKeyListener
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.text.method.<A HREF="../../../../reference/android/text/method/MetaKeyKeyListener.html" target="_top"><font size="+3"><tt>MetaKeyKeyListener</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.method.MetaKeyKeyListener.adjustMetaAfterKeypress_added(long)"></A>
+  <nobr><code>long</code>&nbsp;<A HREF="../../../../reference/android/text/method/MetaKeyKeyListener.html#adjustMetaAfterKeypress(long)" target="_top"><xfont size="+1"><tt>adjustMetaAfterKeypress</tt></font></A>(<code>long</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.method.MetaKeyKeyListener.clearMetaKeyState_added(long, int)"></A>
+  <nobr><code>long</code>&nbsp;<A HREF="../../../../reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(long, int)" target="_top"><xfont size="+1"><tt>clearMetaKeyState</tt></font></A>(<code>long,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.method.MetaKeyKeyListener.clearMetaKeyState_added(android.view.View, android.text.Editable, int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(android.view.View, android.text.Editable, int)" target="_top"><xfont size="+1"><tt>clearMetaKeyState</tt></font></A>(<code>View,</nobr> Editable<nobr>,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.method.MetaKeyKeyListener.clearMetaKeyState_added(android.text.Editable, int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(android.text.Editable, int)" target="_top"><xfont size="+1"><tt>clearMetaKeyState</tt></font></A>(<code>Editable,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.method.MetaKeyKeyListener.getMetaState_added(long)"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/method/MetaKeyKeyListener.html#getMetaState(long)" target="_top"><xfont size="+1"><tt>getMetaState</tt></font></A>(<code>long</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.method.MetaKeyKeyListener.getMetaState_added(long, int)"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/method/MetaKeyKeyListener.html#getMetaState(long, int)" target="_top"><xfont size="+1"><tt>getMetaState</tt></font></A>(<code>long,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.method.MetaKeyKeyListener.handleKeyDown_added(long, int, android.view.KeyEvent)"></A>
+  <nobr><code>long</code>&nbsp;<A HREF="../../../../reference/android/text/method/MetaKeyKeyListener.html#handleKeyDown(long, int, android.view.KeyEvent)" target="_top"><xfont size="+1"><tt>handleKeyDown</tt></font></A>(<code>long,</nobr> int<nobr>,</nobr> KeyEvent<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.method.MetaKeyKeyListener.handleKeyUp_added(long, int, android.view.KeyEvent)"></A>
+  <nobr><code>long</code>&nbsp;<A HREF="../../../../reference/android/text/method/MetaKeyKeyListener.html#handleKeyUp(long, int, android.view.KeyEvent)" target="_top"><xfont size="+1"><tt>handleKeyUp</tt></font></A>(<code>long,</nobr> int<nobr>,</nobr> KeyEvent<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.method.MetaKeyKeyListener.isSelectingMetaTracker_added(java.lang.CharSequence, java.lang.Object)"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/text/method/MetaKeyKeyListener.html#isSelectingMetaTracker(java.lang.CharSequence, java.lang.Object)" target="_top"><xfont size="+1"><tt>isSelectingMetaTracker</tt></font></A>(<code>CharSequence,</nobr> Object<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.method.MetaKeyKeyListener.resetLockedMeta_added(long)"></A>
+  <nobr><code>long</code>&nbsp;<A HREF="../../../../reference/android/text/method/MetaKeyKeyListener.html#resetLockedMeta(long)" target="_top"><xfont size="+1"><tt>resetLockedMeta</tt></font></A>(<code>long</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.text.method.MovementMethod.html b/docs/html/sdk/api_diff/3/changes/android.text.method.MovementMethod.html
new file mode 100644
index 000000000000..a86dff5fea56
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.text.method.MovementMethod.html
@@ -0,0 +1,123 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.text.method.MovementMethod
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Interface android.text.method.<A HREF="../../../../reference/android/text/method/MovementMethod.html" target="_top"><font size="+3"><tt>MovementMethod</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.method.MovementMethod.onKeyOther_added(android.widget.TextView, android.text.Spannable, android.view.KeyEvent)"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/text/method/MovementMethod.html#onKeyOther(android.widget.TextView, android.text.Spannable, android.view.KeyEvent)" target="_top"><xfont size="+1"><tt>onKeyOther</tt></font></A>(<code>TextView,</nobr> Spannable<nobr>,</nobr> KeyEvent<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.text.method.MultiTapKeyListener.html b/docs/html/sdk/api_diff/3/changes/android.text.method.MultiTapKeyListener.html
new file mode 100644
index 000000000000..b7c2f52694ec
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.text.method.MultiTapKeyListener.html
@@ -0,0 +1,123 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.text.method.MultiTapKeyListener
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.text.method.<A HREF="../../../../reference/android/text/method/MultiTapKeyListener.html" target="_top"><font size="+3"><tt>MultiTapKeyListener</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.method.MultiTapKeyListener.getInputType_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/method/MultiTapKeyListener.html#getInputType()" target="_top"><xfont size="+1"><tt>getInputType</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.text.method.QwertyKeyListener.html b/docs/html/sdk/api_diff/3/changes/android.text.method.QwertyKeyListener.html
new file mode 100644
index 000000000000..fff86c659b13
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.text.method.QwertyKeyListener.html
@@ -0,0 +1,123 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.text.method.QwertyKeyListener
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.text.method.<A HREF="../../../../reference/android/text/method/QwertyKeyListener.html" target="_top"><font size="+3"><tt>QwertyKeyListener</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.method.QwertyKeyListener.getInputType_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/method/QwertyKeyListener.html#getInputType()" target="_top"><xfont size="+1"><tt>getInputType</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.text.method.ScrollingMovementMethod.html b/docs/html/sdk/api_diff/3/changes/android.text.method.ScrollingMovementMethod.html
new file mode 100644
index 000000000000..acf5dcd844aa
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.text.method.ScrollingMovementMethod.html
@@ -0,0 +1,123 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.text.method.ScrollingMovementMethod
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.text.method.<A HREF="../../../../reference/android/text/method/ScrollingMovementMethod.html" target="_top"><font size="+3"><tt>ScrollingMovementMethod</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.method.ScrollingMovementMethod.onKeyOther_added(android.widget.TextView, android.text.Spannable, android.view.KeyEvent)"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/text/method/ScrollingMovementMethod.html#onKeyOther(android.widget.TextView, android.text.Spannable, android.view.KeyEvent)" target="_top"><xfont size="+1"><tt>onKeyOther</tt></font></A>(<code>TextView,</nobr> Spannable<nobr>,</nobr> KeyEvent<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.text.method.TextKeyListener.html b/docs/html/sdk/api_diff/3/changes/android.text.method.TextKeyListener.html
new file mode 100644
index 000000000000..f905b3fe75f3
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.text.method.TextKeyListener.html
@@ -0,0 +1,123 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.text.method.TextKeyListener
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.text.method.<A HREF="../../../../reference/android/text/method/TextKeyListener.html" target="_top"><font size="+3"><tt>TextKeyListener</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.method.TextKeyListener.getInputType_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/method/TextKeyListener.html#getInputType()" target="_top"><xfont size="+1"><tt>getInputType</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.text.method.TimeKeyListener.html b/docs/html/sdk/api_diff/3/changes/android.text.method.TimeKeyListener.html
new file mode 100644
index 000000000000..0545b2fb4266
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.text.method.TimeKeyListener.html
@@ -0,0 +1,123 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.text.method.TimeKeyListener
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.text.method.<A HREF="../../../../reference/android/text/method/TimeKeyListener.html" target="_top"><font size="+3"><tt>TimeKeyListener</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.method.TimeKeyListener.getInputType_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/method/TimeKeyListener.html#getInputType()" target="_top"><xfont size="+1"><tt>getInputType</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.text.method.Touch.html b/docs/html/sdk/api_diff/3/changes/android.text.method.Touch.html
new file mode 100644
index 000000000000..fd0f64a6a3c8
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.text.method.Touch.html
@@ -0,0 +1,130 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.text.method.Touch
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.text.method.<A HREF="../../../../reference/android/text/method/Touch.html" target="_top"><font size="+3"><tt>Touch</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.method.Touch.getInitialScrollX_added(android.widget.TextView, android.text.Spannable)"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/method/Touch.html#getInitialScrollX(android.widget.TextView, android.text.Spannable)" target="_top"><xfont size="+1"><tt>getInitialScrollX</tt></font></A>(<code>TextView,</nobr> Spannable<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.method.Touch.getInitialScrollY_added(android.widget.TextView, android.text.Spannable)"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/method/Touch.html#getInitialScrollY(android.widget.TextView, android.text.Spannable)" target="_top"><xfont size="+1"><tt>getInitialScrollY</tt></font></A>(<code>TextView,</nobr> Spannable<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.text.style.AbsoluteSizeSpan.html b/docs/html/sdk/api_diff/3/changes/android.text.style.AbsoluteSizeSpan.html
new file mode 100644
index 000000000000..32b1098ef891
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.text.style.AbsoluteSizeSpan.html
@@ -0,0 +1,153 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.text.style.AbsoluteSizeSpan
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.text.style.<A HREF="../../../../reference/android/text/style/AbsoluteSizeSpan.html" target="_top"><font size="+3"><tt>AbsoluteSizeSpan</tt></font></A>
+</H2>
+<p><font xsize="+1">Added interface <code>android.text.ParcelableSpan</code>.<br></font>
+<a NAME="constructors"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Constructors" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Constructors</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.AbsoluteSizeSpan.ctor_added(android.os.Parcel)"></A>
+  <nobr><A HREF="../../../../reference/android/text/style/AbsoluteSizeSpan.html#AbsoluteSizeSpan(android.os.Parcel)" target="_top"><xfont size="+1"><tt>AbsoluteSizeSpan</tt></font></A>(<code>Parcel</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.AbsoluteSizeSpan.describeContents_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/style/AbsoluteSizeSpan.html#describeContents()" target="_top"><xfont size="+1"><tt>describeContents</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.AbsoluteSizeSpan.getSpanTypeId_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/style/AbsoluteSizeSpan.html#getSpanTypeId()" target="_top"><xfont size="+1"><tt>getSpanTypeId</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.AbsoluteSizeSpan.writeToParcel_added(android.os.Parcel, int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/text/style/AbsoluteSizeSpan.html#writeToParcel(android.os.Parcel, int)" target="_top"><xfont size="+1"><tt>writeToParcel</tt></font></A>(<code>Parcel,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.text.style.AlignmentSpan.Standard.html b/docs/html/sdk/api_diff/3/changes/android.text.style.AlignmentSpan.Standard.html
new file mode 100644
index 000000000000..86b03d47bbfb
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.text.style.AlignmentSpan.Standard.html
@@ -0,0 +1,153 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.text.style.AlignmentSpan.Standard
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.text.style.<A HREF="../../../../reference/android/text/style/AlignmentSpan.Standard.html" target="_top"><font size="+3"><tt>AlignmentSpan.Standard</tt></font></A>
+</H2>
+<p><font xsize="+1">Added interface <code>android.text.ParcelableSpan</code>.<br></font>
+<a NAME="constructors"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Constructors" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Constructors</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.AlignmentSpan.Standard.ctor_added(android.os.Parcel)"></A>
+  <nobr><A HREF="../../../../reference/android/text/style/AlignmentSpan.Standard.html#AlignmentSpan.Standard(android.os.Parcel)" target="_top"><xfont size="+1"><tt>AlignmentSpan.Standard</tt></font></A>(<code>Parcel</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.AlignmentSpan.Standard.describeContents_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/style/AlignmentSpan.Standard.html#describeContents()" target="_top"><xfont size="+1"><tt>describeContents</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.AlignmentSpan.Standard.getSpanTypeId_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/style/AlignmentSpan.Standard.html#getSpanTypeId()" target="_top"><xfont size="+1"><tt>getSpanTypeId</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.AlignmentSpan.Standard.writeToParcel_added(android.os.Parcel, int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/text/style/AlignmentSpan.Standard.html#writeToParcel(android.os.Parcel, int)" target="_top"><xfont size="+1"><tt>writeToParcel</tt></font></A>(<code>Parcel,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.text.style.BackgroundColorSpan.html b/docs/html/sdk/api_diff/3/changes/android.text.style.BackgroundColorSpan.html
new file mode 100644
index 000000000000..b7705aaee5f1
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.text.style.BackgroundColorSpan.html
@@ -0,0 +1,153 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.text.style.BackgroundColorSpan
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.text.style.<A HREF="../../../../reference/android/text/style/BackgroundColorSpan.html" target="_top"><font size="+3"><tt>BackgroundColorSpan</tt></font></A>
+</H2>
+<p><font xsize="+1">Added interfaces <code>android.text.ParcelableSpan, android.text.style.UpdateAppearance</code>.<br></font>
+<a NAME="constructors"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Constructors" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Constructors</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.BackgroundColorSpan.ctor_added(android.os.Parcel)"></A>
+  <nobr><A HREF="../../../../reference/android/text/style/BackgroundColorSpan.html#BackgroundColorSpan(android.os.Parcel)" target="_top"><xfont size="+1"><tt>BackgroundColorSpan</tt></font></A>(<code>Parcel</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.BackgroundColorSpan.describeContents_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/style/BackgroundColorSpan.html#describeContents()" target="_top"><xfont size="+1"><tt>describeContents</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.BackgroundColorSpan.getSpanTypeId_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/style/BackgroundColorSpan.html#getSpanTypeId()" target="_top"><xfont size="+1"><tt>getSpanTypeId</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.BackgroundColorSpan.writeToParcel_added(android.os.Parcel, int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/text/style/BackgroundColorSpan.html#writeToParcel(android.os.Parcel, int)" target="_top"><xfont size="+1"><tt>writeToParcel</tt></font></A>(<code>Parcel,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.text.style.BulletSpan.html b/docs/html/sdk/api_diff/3/changes/android.text.style.BulletSpan.html
new file mode 100644
index 000000000000..10f6d2aa0445
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.text.style.BulletSpan.html
@@ -0,0 +1,153 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.text.style.BulletSpan
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.text.style.<A HREF="../../../../reference/android/text/style/BulletSpan.html" target="_top"><font size="+3"><tt>BulletSpan</tt></font></A>
+</H2>
+<p><font xsize="+1">Added interface <code>android.text.ParcelableSpan</code>.<br></font>
+<a NAME="constructors"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Constructors" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Constructors</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.BulletSpan.ctor_added(android.os.Parcel)"></A>
+  <nobr><A HREF="../../../../reference/android/text/style/BulletSpan.html#BulletSpan(android.os.Parcel)" target="_top"><xfont size="+1"><tt>BulletSpan</tt></font></A>(<code>Parcel</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.BulletSpan.describeContents_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/style/BulletSpan.html#describeContents()" target="_top"><xfont size="+1"><tt>describeContents</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.BulletSpan.getSpanTypeId_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/style/BulletSpan.html#getSpanTypeId()" target="_top"><xfont size="+1"><tt>getSpanTypeId</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.BulletSpan.writeToParcel_added(android.os.Parcel, int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/text/style/BulletSpan.html#writeToParcel(android.os.Parcel, int)" target="_top"><xfont size="+1"><tt>writeToParcel</tt></font></A>(<code>Parcel,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.text.style.ClickableSpan.html b/docs/html/sdk/api_diff/3/changes/android.text.style.ClickableSpan.html
new file mode 100644
index 000000000000..0d7fecb93a4d
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.text.style.ClickableSpan.html
@@ -0,0 +1,109 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.text.style.ClickableSpan
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.text.style.<A HREF="../../../../reference/android/text/style/ClickableSpan.html" target="_top"><font size="+3"><tt>ClickableSpan</tt></font></A>
+</H2>
+<p><font xsize="+1">Added interface <code>android.text.style.UpdateAppearance</code>.<br></font>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.text.style.DynamicDrawableSpan.html b/docs/html/sdk/api_diff/3/changes/android.text.style.DynamicDrawableSpan.html
new file mode 100644
index 000000000000..2bc83fa5da73
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.text.style.DynamicDrawableSpan.html
@@ -0,0 +1,167 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.text.style.DynamicDrawableSpan
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.text.style.<A HREF="../../../../reference/android/text/style/DynamicDrawableSpan.html" target="_top"><font size="+3"><tt>DynamicDrawableSpan</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Constructors" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Constructors</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.DynamicDrawableSpan.ctor_added(int)"></A>
+  <nobr><A HREF="../../../../reference/android/text/style/DynamicDrawableSpan.html#DynamicDrawableSpan(int)" target="_top"><xfont size="+1"><tt>DynamicDrawableSpan</tt></font></A>(<code>int</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.DynamicDrawableSpan.getVerticalAlignment_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/style/DynamicDrawableSpan.html#getVerticalAlignment()" target="_top"><xfont size="+1"><tt>getVerticalAlignment</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.DynamicDrawableSpan.ALIGN_BASELINE"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/style/DynamicDrawableSpan.html#ALIGN_BASELINE" target="_top"><xfont size="+1"><tt>ALIGN_BASELINE</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.DynamicDrawableSpan.ALIGN_BOTTOM"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/style/DynamicDrawableSpan.html#ALIGN_BOTTOM" target="_top"><xfont size="+1"><tt>ALIGN_BOTTOM</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.DynamicDrawableSpan.mVerticalAlignment"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/style/DynamicDrawableSpan.html#mVerticalAlignment" target="_top"><xfont size="+1"><tt>mVerticalAlignment</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.text.style.ForegroundColorSpan.html b/docs/html/sdk/api_diff/3/changes/android.text.style.ForegroundColorSpan.html
new file mode 100644
index 000000000000..fa483c002d9f
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.text.style.ForegroundColorSpan.html
@@ -0,0 +1,153 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.text.style.ForegroundColorSpan
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.text.style.<A HREF="../../../../reference/android/text/style/ForegroundColorSpan.html" target="_top"><font size="+3"><tt>ForegroundColorSpan</tt></font></A>
+</H2>
+<p><font xsize="+1">Added interfaces <code>android.text.ParcelableSpan, android.text.style.UpdateAppearance</code>.<br></font>
+<a NAME="constructors"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Constructors" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Constructors</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.ForegroundColorSpan.ctor_added(android.os.Parcel)"></A>
+  <nobr><A HREF="../../../../reference/android/text/style/ForegroundColorSpan.html#ForegroundColorSpan(android.os.Parcel)" target="_top"><xfont size="+1"><tt>ForegroundColorSpan</tt></font></A>(<code>Parcel</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.ForegroundColorSpan.describeContents_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/style/ForegroundColorSpan.html#describeContents()" target="_top"><xfont size="+1"><tt>describeContents</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.ForegroundColorSpan.getSpanTypeId_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/style/ForegroundColorSpan.html#getSpanTypeId()" target="_top"><xfont size="+1"><tt>getSpanTypeId</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.ForegroundColorSpan.writeToParcel_added(android.os.Parcel, int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/text/style/ForegroundColorSpan.html#writeToParcel(android.os.Parcel, int)" target="_top"><xfont size="+1"><tt>writeToParcel</tt></font></A>(<code>Parcel,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.text.style.ImageSpan.html b/docs/html/sdk/api_diff/3/changes/android.text.style.ImageSpan.html
new file mode 100644
index 000000000000..459e2b7e510c
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.text.style.ImageSpan.html
@@ -0,0 +1,151 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.text.style.ImageSpan
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.text.style.<A HREF="../../../../reference/android/text/style/ImageSpan.html" target="_top"><font size="+3"><tt>ImageSpan</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Constructors" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Constructors</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.ImageSpan.ctor_added(android.content.Context, android.net.Uri, int)"></A>
+  <nobr><A HREF="../../../../reference/android/text/style/ImageSpan.html#ImageSpan(android.content.Context, android.net.Uri, int)" target="_top"><xfont size="+1"><tt>ImageSpan</tt></font></A>(<code>Context,</nobr> Uri<nobr>,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.ImageSpan.ctor_added(android.content.Context, int, int)"></A>
+  <nobr><A HREF="../../../../reference/android/text/style/ImageSpan.html#ImageSpan(android.content.Context, int, int)" target="_top"><xfont size="+1"><tt>ImageSpan</tt></font></A>(<code>Context,</nobr> int<nobr>,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.ImageSpan.ctor_added(android.graphics.Bitmap, int)"></A>
+  <nobr><A HREF="../../../../reference/android/text/style/ImageSpan.html#ImageSpan(android.graphics.Bitmap, int)" target="_top"><xfont size="+1"><tt>ImageSpan</tt></font></A>(<code>Bitmap,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.ImageSpan.ctor_added(android.graphics.drawable.Drawable, int)"></A>
+  <nobr><A HREF="../../../../reference/android/text/style/ImageSpan.html#ImageSpan(android.graphics.drawable.Drawable, int)" target="_top"><xfont size="+1"><tt>ImageSpan</tt></font></A>(<code>Drawable,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.ImageSpan.ctor_added(android.graphics.drawable.Drawable, java.lang.String, int)"></A>
+  <nobr><A HREF="../../../../reference/android/text/style/ImageSpan.html#ImageSpan(android.graphics.drawable.Drawable, java.lang.String, int)" target="_top"><xfont size="+1"><tt>ImageSpan</tt></font></A>(<code>Drawable,</nobr> String<nobr>,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="methods"></a>
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.text.style.LeadingMarginSpan.Standard.html b/docs/html/sdk/api_diff/3/changes/android.text.style.LeadingMarginSpan.Standard.html
new file mode 100644
index 000000000000..922bcbc607bc
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.text.style.LeadingMarginSpan.Standard.html
@@ -0,0 +1,153 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.text.style.LeadingMarginSpan.Standard
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.text.style.<A HREF="../../../../reference/android/text/style/LeadingMarginSpan.Standard.html" target="_top"><font size="+3"><tt>LeadingMarginSpan.Standard</tt></font></A>
+</H2>
+<p><font xsize="+1">Added interface <code>android.text.ParcelableSpan</code>.<br></font>
+<a NAME="constructors"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Constructors" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Constructors</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.LeadingMarginSpan.Standard.ctor_added(android.os.Parcel)"></A>
+  <nobr><A HREF="../../../../reference/android/text/style/LeadingMarginSpan.Standard.html#LeadingMarginSpan.Standard(android.os.Parcel)" target="_top"><xfont size="+1"><tt>LeadingMarginSpan.Standard</tt></font></A>(<code>Parcel</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.LeadingMarginSpan.Standard.describeContents_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/style/LeadingMarginSpan.Standard.html#describeContents()" target="_top"><xfont size="+1"><tt>describeContents</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.LeadingMarginSpan.Standard.getSpanTypeId_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/style/LeadingMarginSpan.Standard.html#getSpanTypeId()" target="_top"><xfont size="+1"><tt>getSpanTypeId</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.LeadingMarginSpan.Standard.writeToParcel_added(android.os.Parcel, int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/text/style/LeadingMarginSpan.Standard.html#writeToParcel(android.os.Parcel, int)" target="_top"><xfont size="+1"><tt>writeToParcel</tt></font></A>(<code>Parcel,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.text.style.MaskFilterSpan.html b/docs/html/sdk/api_diff/3/changes/android.text.style.MaskFilterSpan.html
new file mode 100644
index 000000000000..fbd8db93560c
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.text.style.MaskFilterSpan.html
@@ -0,0 +1,109 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.text.style.MaskFilterSpan
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.text.style.<A HREF="../../../../reference/android/text/style/MaskFilterSpan.html" target="_top"><font size="+3"><tt>MaskFilterSpan</tt></font></A>
+</H2>
+<p><font xsize="+1">Added interface <code>android.text.style.UpdateAppearance</code>.<br></font>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.text.style.QuoteSpan.html b/docs/html/sdk/api_diff/3/changes/android.text.style.QuoteSpan.html
new file mode 100644
index 000000000000..334c2233552a
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.text.style.QuoteSpan.html
@@ -0,0 +1,153 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.text.style.QuoteSpan
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.text.style.<A HREF="../../../../reference/android/text/style/QuoteSpan.html" target="_top"><font size="+3"><tt>QuoteSpan</tt></font></A>
+</H2>
+<p><font xsize="+1">Added interface <code>android.text.ParcelableSpan</code>.<br></font>
+<a NAME="constructors"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Constructors" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Constructors</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.QuoteSpan.ctor_added(android.os.Parcel)"></A>
+  <nobr><A HREF="../../../../reference/android/text/style/QuoteSpan.html#QuoteSpan(android.os.Parcel)" target="_top"><xfont size="+1"><tt>QuoteSpan</tt></font></A>(<code>Parcel</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.QuoteSpan.describeContents_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/style/QuoteSpan.html#describeContents()" target="_top"><xfont size="+1"><tt>describeContents</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.QuoteSpan.getSpanTypeId_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/style/QuoteSpan.html#getSpanTypeId()" target="_top"><xfont size="+1"><tt>getSpanTypeId</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.QuoteSpan.writeToParcel_added(android.os.Parcel, int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/text/style/QuoteSpan.html#writeToParcel(android.os.Parcel, int)" target="_top"><xfont size="+1"><tt>writeToParcel</tt></font></A>(<code>Parcel,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.text.style.RasterizerSpan.html b/docs/html/sdk/api_diff/3/changes/android.text.style.RasterizerSpan.html
new file mode 100644
index 000000000000..62fb6479f8f7
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.text.style.RasterizerSpan.html
@@ -0,0 +1,109 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.text.style.RasterizerSpan
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.text.style.<A HREF="../../../../reference/android/text/style/RasterizerSpan.html" target="_top"><font size="+3"><tt>RasterizerSpan</tt></font></A>
+</H2>
+<p><font xsize="+1">Added interface <code>android.text.style.UpdateAppearance</code>.<br></font>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.text.style.RelativeSizeSpan.html b/docs/html/sdk/api_diff/3/changes/android.text.style.RelativeSizeSpan.html
new file mode 100644
index 000000000000..17d97fba524b
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.text.style.RelativeSizeSpan.html
@@ -0,0 +1,153 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.text.style.RelativeSizeSpan
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.text.style.<A HREF="../../../../reference/android/text/style/RelativeSizeSpan.html" target="_top"><font size="+3"><tt>RelativeSizeSpan</tt></font></A>
+</H2>
+<p><font xsize="+1">Added interface <code>android.text.ParcelableSpan</code>.<br></font>
+<a NAME="constructors"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Constructors" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Constructors</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.RelativeSizeSpan.ctor_added(android.os.Parcel)"></A>
+  <nobr><A HREF="../../../../reference/android/text/style/RelativeSizeSpan.html#RelativeSizeSpan(android.os.Parcel)" target="_top"><xfont size="+1"><tt>RelativeSizeSpan</tt></font></A>(<code>Parcel</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.RelativeSizeSpan.describeContents_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/style/RelativeSizeSpan.html#describeContents()" target="_top"><xfont size="+1"><tt>describeContents</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.RelativeSizeSpan.getSpanTypeId_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/style/RelativeSizeSpan.html#getSpanTypeId()" target="_top"><xfont size="+1"><tt>getSpanTypeId</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.RelativeSizeSpan.writeToParcel_added(android.os.Parcel, int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/text/style/RelativeSizeSpan.html#writeToParcel(android.os.Parcel, int)" target="_top"><xfont size="+1"><tt>writeToParcel</tt></font></A>(<code>Parcel,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.text.style.ScaleXSpan.html b/docs/html/sdk/api_diff/3/changes/android.text.style.ScaleXSpan.html
new file mode 100644
index 000000000000..ee289f518ff2
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.text.style.ScaleXSpan.html
@@ -0,0 +1,153 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.text.style.ScaleXSpan
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.text.style.<A HREF="../../../../reference/android/text/style/ScaleXSpan.html" target="_top"><font size="+3"><tt>ScaleXSpan</tt></font></A>
+</H2>
+<p><font xsize="+1">Added interface <code>android.text.ParcelableSpan</code>.<br></font>
+<a NAME="constructors"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Constructors" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Constructors</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.ScaleXSpan.ctor_added(android.os.Parcel)"></A>
+  <nobr><A HREF="../../../../reference/android/text/style/ScaleXSpan.html#ScaleXSpan(android.os.Parcel)" target="_top"><xfont size="+1"><tt>ScaleXSpan</tt></font></A>(<code>Parcel</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.ScaleXSpan.describeContents_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/style/ScaleXSpan.html#describeContents()" target="_top"><xfont size="+1"><tt>describeContents</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.ScaleXSpan.getSpanTypeId_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/style/ScaleXSpan.html#getSpanTypeId()" target="_top"><xfont size="+1"><tt>getSpanTypeId</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.ScaleXSpan.writeToParcel_added(android.os.Parcel, int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/text/style/ScaleXSpan.html#writeToParcel(android.os.Parcel, int)" target="_top"><xfont size="+1"><tt>writeToParcel</tt></font></A>(<code>Parcel,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.text.style.StrikethroughSpan.html b/docs/html/sdk/api_diff/3/changes/android.text.style.StrikethroughSpan.html
new file mode 100644
index 000000000000..f045b964395f
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.text.style.StrikethroughSpan.html
@@ -0,0 +1,153 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.text.style.StrikethroughSpan
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.text.style.<A HREF="../../../../reference/android/text/style/StrikethroughSpan.html" target="_top"><font size="+3"><tt>StrikethroughSpan</tt></font></A>
+</H2>
+<p><font xsize="+1">Added interfaces <code>android.text.ParcelableSpan, android.text.style.UpdateAppearance</code>.<br></font>
+<a NAME="constructors"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Constructors" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Constructors</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.StrikethroughSpan.ctor_added(android.os.Parcel)"></A>
+  <nobr><A HREF="../../../../reference/android/text/style/StrikethroughSpan.html#StrikethroughSpan(android.os.Parcel)" target="_top"><xfont size="+1"><tt>StrikethroughSpan</tt></font></A>(<code>Parcel</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.StrikethroughSpan.describeContents_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/style/StrikethroughSpan.html#describeContents()" target="_top"><xfont size="+1"><tt>describeContents</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.StrikethroughSpan.getSpanTypeId_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/style/StrikethroughSpan.html#getSpanTypeId()" target="_top"><xfont size="+1"><tt>getSpanTypeId</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.StrikethroughSpan.writeToParcel_added(android.os.Parcel, int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/text/style/StrikethroughSpan.html#writeToParcel(android.os.Parcel, int)" target="_top"><xfont size="+1"><tt>writeToParcel</tt></font></A>(<code>Parcel,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.text.style.StyleSpan.html b/docs/html/sdk/api_diff/3/changes/android.text.style.StyleSpan.html
new file mode 100644
index 000000000000..fcc16080d017
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.text.style.StyleSpan.html
@@ -0,0 +1,153 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.text.style.StyleSpan
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.text.style.<A HREF="../../../../reference/android/text/style/StyleSpan.html" target="_top"><font size="+3"><tt>StyleSpan</tt></font></A>
+</H2>
+<p><font xsize="+1">Added interface <code>android.text.ParcelableSpan</code>.<br></font>
+<a NAME="constructors"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Constructors" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Constructors</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.StyleSpan.ctor_added(android.os.Parcel)"></A>
+  <nobr><A HREF="../../../../reference/android/text/style/StyleSpan.html#StyleSpan(android.os.Parcel)" target="_top"><xfont size="+1"><tt>StyleSpan</tt></font></A>(<code>Parcel</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.StyleSpan.describeContents_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/style/StyleSpan.html#describeContents()" target="_top"><xfont size="+1"><tt>describeContents</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.StyleSpan.getSpanTypeId_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/style/StyleSpan.html#getSpanTypeId()" target="_top"><xfont size="+1"><tt>getSpanTypeId</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.StyleSpan.writeToParcel_added(android.os.Parcel, int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/text/style/StyleSpan.html#writeToParcel(android.os.Parcel, int)" target="_top"><xfont size="+1"><tt>writeToParcel</tt></font></A>(<code>Parcel,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.text.style.SubscriptSpan.html b/docs/html/sdk/api_diff/3/changes/android.text.style.SubscriptSpan.html
new file mode 100644
index 000000000000..ec3d56242b15
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.text.style.SubscriptSpan.html
@@ -0,0 +1,153 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.text.style.SubscriptSpan
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.text.style.<A HREF="../../../../reference/android/text/style/SubscriptSpan.html" target="_top"><font size="+3"><tt>SubscriptSpan</tt></font></A>
+</H2>
+<p><font xsize="+1">Added interface <code>android.text.ParcelableSpan</code>.<br></font>
+<a NAME="constructors"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Constructors" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Constructors</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.SubscriptSpan.ctor_added(android.os.Parcel)"></A>
+  <nobr><A HREF="../../../../reference/android/text/style/SubscriptSpan.html#SubscriptSpan(android.os.Parcel)" target="_top"><xfont size="+1"><tt>SubscriptSpan</tt></font></A>(<code>Parcel</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.SubscriptSpan.describeContents_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/style/SubscriptSpan.html#describeContents()" target="_top"><xfont size="+1"><tt>describeContents</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.SubscriptSpan.getSpanTypeId_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/style/SubscriptSpan.html#getSpanTypeId()" target="_top"><xfont size="+1"><tt>getSpanTypeId</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.SubscriptSpan.writeToParcel_added(android.os.Parcel, int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/text/style/SubscriptSpan.html#writeToParcel(android.os.Parcel, int)" target="_top"><xfont size="+1"><tt>writeToParcel</tt></font></A>(<code>Parcel,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.text.style.SuperscriptSpan.html b/docs/html/sdk/api_diff/3/changes/android.text.style.SuperscriptSpan.html
new file mode 100644
index 000000000000..853be697af24
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.text.style.SuperscriptSpan.html
@@ -0,0 +1,153 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.text.style.SuperscriptSpan
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.text.style.<A HREF="../../../../reference/android/text/style/SuperscriptSpan.html" target="_top"><font size="+3"><tt>SuperscriptSpan</tt></font></A>
+</H2>
+<p><font xsize="+1">Added interface <code>android.text.ParcelableSpan</code>.<br></font>
+<a NAME="constructors"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Constructors" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Constructors</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.SuperscriptSpan.ctor_added(android.os.Parcel)"></A>
+  <nobr><A HREF="../../../../reference/android/text/style/SuperscriptSpan.html#SuperscriptSpan(android.os.Parcel)" target="_top"><xfont size="+1"><tt>SuperscriptSpan</tt></font></A>(<code>Parcel</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.SuperscriptSpan.describeContents_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/style/SuperscriptSpan.html#describeContents()" target="_top"><xfont size="+1"><tt>describeContents</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.SuperscriptSpan.getSpanTypeId_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/style/SuperscriptSpan.html#getSpanTypeId()" target="_top"><xfont size="+1"><tt>getSpanTypeId</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.SuperscriptSpan.writeToParcel_added(android.os.Parcel, int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/text/style/SuperscriptSpan.html#writeToParcel(android.os.Parcel, int)" target="_top"><xfont size="+1"><tt>writeToParcel</tt></font></A>(<code>Parcel,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.text.style.TextAppearanceSpan.html b/docs/html/sdk/api_diff/3/changes/android.text.style.TextAppearanceSpan.html
new file mode 100644
index 000000000000..719e68f0ce14
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.text.style.TextAppearanceSpan.html
@@ -0,0 +1,153 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.text.style.TextAppearanceSpan
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.text.style.<A HREF="../../../../reference/android/text/style/TextAppearanceSpan.html" target="_top"><font size="+3"><tt>TextAppearanceSpan</tt></font></A>
+</H2>
+<p><font xsize="+1">Added interface <code>android.text.ParcelableSpan</code>.<br></font>
+<a NAME="constructors"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Constructors" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Constructors</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.TextAppearanceSpan.ctor_added(android.os.Parcel)"></A>
+  <nobr><A HREF="../../../../reference/android/text/style/TextAppearanceSpan.html#TextAppearanceSpan(android.os.Parcel)" target="_top"><xfont size="+1"><tt>TextAppearanceSpan</tt></font></A>(<code>Parcel</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.TextAppearanceSpan.describeContents_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/style/TextAppearanceSpan.html#describeContents()" target="_top"><xfont size="+1"><tt>describeContents</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.TextAppearanceSpan.getSpanTypeId_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/style/TextAppearanceSpan.html#getSpanTypeId()" target="_top"><xfont size="+1"><tt>getSpanTypeId</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.TextAppearanceSpan.writeToParcel_added(android.os.Parcel, int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/text/style/TextAppearanceSpan.html#writeToParcel(android.os.Parcel, int)" target="_top"><xfont size="+1"><tt>writeToParcel</tt></font></A>(<code>Parcel,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.text.style.TypefaceSpan.html b/docs/html/sdk/api_diff/3/changes/android.text.style.TypefaceSpan.html
new file mode 100644
index 000000000000..01b74e73408e
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.text.style.TypefaceSpan.html
@@ -0,0 +1,153 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.text.style.TypefaceSpan
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.text.style.<A HREF="../../../../reference/android/text/style/TypefaceSpan.html" target="_top"><font size="+3"><tt>TypefaceSpan</tt></font></A>
+</H2>
+<p><font xsize="+1">Added interface <code>android.text.ParcelableSpan</code>.<br></font>
+<a NAME="constructors"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Constructors" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Constructors</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.TypefaceSpan.ctor_added(android.os.Parcel)"></A>
+  <nobr><A HREF="../../../../reference/android/text/style/TypefaceSpan.html#TypefaceSpan(android.os.Parcel)" target="_top"><xfont size="+1"><tt>TypefaceSpan</tt></font></A>(<code>Parcel</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.TypefaceSpan.describeContents_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/style/TypefaceSpan.html#describeContents()" target="_top"><xfont size="+1"><tt>describeContents</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.TypefaceSpan.getSpanTypeId_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/style/TypefaceSpan.html#getSpanTypeId()" target="_top"><xfont size="+1"><tt>getSpanTypeId</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.TypefaceSpan.writeToParcel_added(android.os.Parcel, int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/text/style/TypefaceSpan.html#writeToParcel(android.os.Parcel, int)" target="_top"><xfont size="+1"><tt>writeToParcel</tt></font></A>(<code>Parcel,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.text.style.URLSpan.html b/docs/html/sdk/api_diff/3/changes/android.text.style.URLSpan.html
new file mode 100644
index 000000000000..2a659a4e35c0
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.text.style.URLSpan.html
@@ -0,0 +1,153 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.text.style.URLSpan
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.text.style.<A HREF="../../../../reference/android/text/style/URLSpan.html" target="_top"><font size="+3"><tt>URLSpan</tt></font></A>
+</H2>
+<p><font xsize="+1">Added interface <code>android.text.ParcelableSpan</code>.<br></font>
+<a NAME="constructors"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Constructors" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Constructors</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.URLSpan.ctor_added(android.os.Parcel)"></A>
+  <nobr><A HREF="../../../../reference/android/text/style/URLSpan.html#URLSpan(android.os.Parcel)" target="_top"><xfont size="+1"><tt>URLSpan</tt></font></A>(<code>Parcel</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.URLSpan.describeContents_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/style/URLSpan.html#describeContents()" target="_top"><xfont size="+1"><tt>describeContents</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.URLSpan.getSpanTypeId_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/style/URLSpan.html#getSpanTypeId()" target="_top"><xfont size="+1"><tt>getSpanTypeId</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.URLSpan.writeToParcel_added(android.os.Parcel, int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/text/style/URLSpan.html#writeToParcel(android.os.Parcel, int)" target="_top"><xfont size="+1"><tt>writeToParcel</tt></font></A>(<code>Parcel,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.text.style.UnderlineSpan.html b/docs/html/sdk/api_diff/3/changes/android.text.style.UnderlineSpan.html
new file mode 100644
index 000000000000..6c596a03da91
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.text.style.UnderlineSpan.html
@@ -0,0 +1,153 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.text.style.UnderlineSpan
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.text.style.<A HREF="../../../../reference/android/text/style/UnderlineSpan.html" target="_top"><font size="+3"><tt>UnderlineSpan</tt></font></A>
+</H2>
+<p><font xsize="+1">Added interfaces <code>android.text.ParcelableSpan, android.text.style.UpdateAppearance</code>.<br></font>
+<a NAME="constructors"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Constructors" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Constructors</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.UnderlineSpan.ctor_added(android.os.Parcel)"></A>
+  <nobr><A HREF="../../../../reference/android/text/style/UnderlineSpan.html#UnderlineSpan(android.os.Parcel)" target="_top"><xfont size="+1"><tt>UnderlineSpan</tt></font></A>(<code>Parcel</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.UnderlineSpan.describeContents_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/style/UnderlineSpan.html#describeContents()" target="_top"><xfont size="+1"><tt>describeContents</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.UnderlineSpan.getSpanTypeId_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/text/style/UnderlineSpan.html#getSpanTypeId()" target="_top"><xfont size="+1"><tt>getSpanTypeId</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style.UnderlineSpan.writeToParcel_added(android.os.Parcel, int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/text/style/UnderlineSpan.html#writeToParcel(android.os.Parcel, int)" target="_top"><xfont size="+1"><tt>writeToParcel</tt></font></A>(<code>Parcel,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.text.style.UpdateLayout.html b/docs/html/sdk/api_diff/3/changes/android.text.style.UpdateLayout.html
new file mode 100644
index 000000000000..4cca7b433476
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.text.style.UpdateLayout.html
@@ -0,0 +1,109 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.text.style.UpdateLayout
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Interface android.text.style.<A HREF="../../../../reference/android/text/style/UpdateLayout.html" target="_top"><font size="+3"><tt>UpdateLayout</tt></font></A>
+</H2>
+<p><font xsize="+1">Added interface <code>android.text.style.UpdateAppearance</code>.<br></font>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.util.SparseIntArray.html b/docs/html/sdk/api_diff/3/changes/android.util.SparseIntArray.html
new file mode 100644
index 000000000000..5657765133fd
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.util.SparseIntArray.html
@@ -0,0 +1,123 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.util.SparseIntArray
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.util.<A HREF="../../../../reference/android/util/SparseIntArray.html" target="_top"><font size="+3"><tt>SparseIntArray</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.util.SparseIntArray.removeAt_added(int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/util/SparseIntArray.html#removeAt(int)" target="_top"><xfont size="+1"><tt>removeAt</tt></font></A>(<code>int</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.util.TimeUtils.html b/docs/html/sdk/api_diff/3/changes/android.util.TimeUtils.html
new file mode 100644
index 000000000000..3317fae27bb3
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.util.TimeUtils.html
@@ -0,0 +1,123 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.util.TimeUtils
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.util.<A HREF="../../../../reference/android/util/TimeUtils.html" target="_top"><font size="+3"><tt>TimeUtils</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.util.TimeUtils.getTimeZoneDatabaseVersion_added()"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/util/TimeUtils.html#getTimeZoneDatabaseVersion()" target="_top"><xfont size="+1"><tt>getTimeZoneDatabaseVersion</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.view.GestureDetector.SimpleOnGestureListener.html b/docs/html/sdk/api_diff/3/changes/android.view.GestureDetector.SimpleOnGestureListener.html
new file mode 100644
index 000000000000..0e00c6047a5e
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.view.GestureDetector.SimpleOnGestureListener.html
@@ -0,0 +1,138 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.view.GestureDetector.SimpleOnGestureListener
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.view.<A HREF="../../../../reference/android/view/GestureDetector.SimpleOnGestureListener.html" target="_top"><font size="+3"><tt>GestureDetector.SimpleOnGestureListener</tt></font></A>
+</H2>
+<p><font xsize="+1">Added interface <code>android.view.GestureDetector.OnDoubleTapListener</code>.<br></font>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.GestureDetector.SimpleOnGestureListener.onDoubleTap_added(android.view.MotionEvent)"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/view/GestureDetector.SimpleOnGestureListener.html#onDoubleTap(android.view.MotionEvent)" target="_top"><xfont size="+1"><tt>onDoubleTap</tt></font></A>(<code>MotionEvent</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.GestureDetector.SimpleOnGestureListener.onDoubleTapEvent_added(android.view.MotionEvent)"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/view/GestureDetector.SimpleOnGestureListener.html#onDoubleTapEvent(android.view.MotionEvent)" target="_top"><xfont size="+1"><tt>onDoubleTapEvent</tt></font></A>(<code>MotionEvent</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.GestureDetector.SimpleOnGestureListener.onSingleTapConfirmed_added(android.view.MotionEvent)"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/view/GestureDetector.SimpleOnGestureListener.html#onSingleTapConfirmed(android.view.MotionEvent)" target="_top"><xfont size="+1"><tt>onSingleTapConfirmed</tt></font></A>(<code>MotionEvent</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.view.GestureDetector.html b/docs/html/sdk/api_diff/3/changes/android.view.GestureDetector.html
new file mode 100644
index 000000000000..dec5a4d9da9a
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.view.GestureDetector.html
@@ -0,0 +1,173 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.view.GestureDetector
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.view.<A HREF="../../../../reference/android/view/GestureDetector.html" target="_top"><font size="+3"><tt>GestureDetector</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Constructors" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Constructors</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.GestureDetector.ctor_added(android.content.Context, android.view.GestureDetector.OnGestureListener)"></A>
+  <nobr><A HREF="../../../../reference/android/view/GestureDetector.html#GestureDetector(android.content.Context, android.view.GestureDetector.OnGestureListener)" target="_top"><xfont size="+1"><tt>GestureDetector</tt></font></A>(<code>Context,</nobr> OnGestureListener<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.GestureDetector.ctor_added(android.content.Context, android.view.GestureDetector.OnGestureListener, android.os.Handler)"></A>
+  <nobr><A HREF="../../../../reference/android/view/GestureDetector.html#GestureDetector(android.content.Context, android.view.GestureDetector.OnGestureListener, android.os.Handler)" target="_top"><xfont size="+1"><tt>GestureDetector</tt></font></A>(<code>Context,</nobr> OnGestureListener<nobr>,</nobr> Handler<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Constructors" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=3>Changed Constructors</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.GestureDetector.ctor_changed(android.view.GestureDetector.OnGestureListener)"></A>
+  <nobr><A HREF="../../../../reference/android/view/GestureDetector.html#GestureDetector(android.view.GestureDetector.OnGestureListener)" target="_top"><xfont size="+1"><tt>GestureDetector</tt></font></A>(<code>OnGestureListener</code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.GestureDetector.ctor_changed(android.view.GestureDetector.OnGestureListener, android.os.Handler)"></A>
+  <nobr><A HREF="../../../../reference/android/view/GestureDetector.html#GestureDetector(android.view.GestureDetector.OnGestureListener, android.os.Handler)" target="_top"><xfont size="+1"><tt>GestureDetector</tt></font></A>(<code>OnGestureListener,</nobr> Handler<nobr><nobr></code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.GestureDetector.setOnDoubleTapListener_added(android.view.GestureDetector.OnDoubleTapListener)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/view/GestureDetector.html#setOnDoubleTapListener(android.view.GestureDetector.OnDoubleTapListener)" target="_top"><xfont size="+1"><tt>setOnDoubleTapListener</tt></font></A>(<code>OnDoubleTapListener</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.view.Gravity.html b/docs/html/sdk/api_diff/3/changes/android.view.Gravity.html
new file mode 100644
index 000000000000..1aa10d3682fb
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.view.Gravity.html
@@ -0,0 +1,166 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.view.Gravity
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.view.<A HREF="../../../../reference/android/view/Gravity.html" target="_top"><font size="+3"><tt>Gravity</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.Gravity.applyDisplay_added(int, android.graphics.Rect, android.graphics.Rect)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/view/Gravity.html#applyDisplay(int, android.graphics.Rect, android.graphics.Rect)" target="_top"><xfont size="+1"><tt>applyDisplay</tt></font></A>(<code>int,</nobr> Rect<nobr>,</nobr> Rect<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.Gravity.AXIS_CLIP"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/Gravity.html#AXIS_CLIP" target="_top"><xfont size="+1"><tt>AXIS_CLIP</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.Gravity.CLIP_HORIZONTAL"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/Gravity.html#CLIP_HORIZONTAL" target="_top"><xfont size="+1"><tt>CLIP_HORIZONTAL</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.Gravity.CLIP_VERTICAL"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/Gravity.html#CLIP_VERTICAL" target="_top"><xfont size="+1"><tt>CLIP_VERTICAL</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.Gravity.DISPLAY_CLIP_HORIZONTAL"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/Gravity.html#DISPLAY_CLIP_HORIZONTAL" target="_top"><xfont size="+1"><tt>DISPLAY_CLIP_HORIZONTAL</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.Gravity.DISPLAY_CLIP_VERTICAL"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/Gravity.html#DISPLAY_CLIP_VERTICAL" target="_top"><xfont size="+1"><tt>DISPLAY_CLIP_VERTICAL</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.view.KeyCharacterMap.html b/docs/html/sdk/api_diff/3/changes/android.view.KeyCharacterMap.html
new file mode 100644
index 000000000000..7a409cbe1308
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.view.KeyCharacterMap.html
@@ -0,0 +1,130 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.view.KeyCharacterMap
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.view.<A HREF="../../../../reference/android/view/KeyCharacterMap.html" target="_top"><font size="+3"><tt>KeyCharacterMap</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.KeyCharacterMap.deviceHasKey_added(int)"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/view/KeyCharacterMap.html#deviceHasKey(int)" target="_top"><xfont size="+1"><tt>deviceHasKey</tt></font></A>(<code>int</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.KeyCharacterMap.deviceHasKeys_added(int[])"></A>
+  <nobr><code>boolean[]</code>&nbsp;<A HREF="../../../../reference/android/view/KeyCharacterMap.html#deviceHasKeys(int[])" target="_top"><xfont size="+1"><tt>deviceHasKeys</tt></font></A>(<code>int[]</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.view.KeyEvent.html b/docs/html/sdk/api_diff/3/changes/android.view.KeyEvent.html
new file mode 100644
index 000000000000..bf3ec6b22e01
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.view.KeyEvent.html
@@ -0,0 +1,275 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.view.KeyEvent
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.view.<A HREF="../../../../reference/android/view/KeyEvent.html" target="_top"><font size="+3"><tt>KeyEvent</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Constructors" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Constructors</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.KeyEvent.ctor_added(android.view.KeyEvent)"></A>
+  <nobr><A HREF="../../../../reference/android/view/KeyEvent.html#KeyEvent(android.view.KeyEvent)" target="_top"><xfont size="+1"><tt>KeyEvent</tt></font></A>(<code>KeyEvent</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.KeyEvent.ctor_added(long, java.lang.String, int, int)"></A>
+  <nobr><A HREF="../../../../reference/android/view/KeyEvent.html#KeyEvent(long, java.lang.String, int, int)" target="_top"><xfont size="+1"><tt>KeyEvent</tt></font></A>(<code>long,</nobr> String<nobr>,</nobr> int<nobr>,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.KeyEvent.changeAction_added(android.view.KeyEvent, int)"></A>
+  <nobr><code>KeyEvent</code>&nbsp;<A HREF="../../../../reference/android/view/KeyEvent.html#changeAction(android.view.KeyEvent, int)" target="_top"><xfont size="+1"><tt>changeAction</tt></font></A>(<code>KeyEvent,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.KeyEvent.changeFlags_added(android.view.KeyEvent, int)"></A>
+  <nobr><code>KeyEvent</code>&nbsp;<A HREF="../../../../reference/android/view/KeyEvent.html#changeFlags(android.view.KeyEvent, int)" target="_top"><xfont size="+1"><tt>changeFlags</tt></font></A>(<code>KeyEvent,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.KeyEvent.changeTimeRepeat_added(android.view.KeyEvent, long, int)"></A>
+  <nobr><code>KeyEvent</code>&nbsp;<A HREF="../../../../reference/android/view/KeyEvent.html#changeTimeRepeat(android.view.KeyEvent, long, int)" target="_top"><xfont size="+1"><tt>changeTimeRepeat</tt></font></A>(<code>KeyEvent,</nobr> long<nobr>,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.KeyEvent.getCharacters_added()"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/view/KeyEvent.html#getCharacters()" target="_top"><xfont size="+1"><tt>getCharacters</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.KeyEvent.getMaxKeyCode_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/KeyEvent.html#getMaxKeyCode()" target="_top"><xfont size="+1"><tt>getMaxKeyCode</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.KeyEvent.FLAG_EDITOR_ACTION"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/KeyEvent.html#FLAG_EDITOR_ACTION" target="_top"><xfont size="+1"><tt>FLAG_EDITOR_ACTION</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.KeyEvent.FLAG_FROM_SYSTEM"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/KeyEvent.html#FLAG_FROM_SYSTEM" target="_top"><xfont size="+1"><tt>FLAG_FROM_SYSTEM</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.KeyEvent.FLAG_KEEP_TOUCH_MODE"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/KeyEvent.html#FLAG_KEEP_TOUCH_MODE" target="_top"><xfont size="+1"><tt>FLAG_KEEP_TOUCH_MODE</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.KeyEvent.FLAG_SOFT_KEYBOARD"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/KeyEvent.html#FLAG_SOFT_KEYBOARD" target="_top"><xfont size="+1"><tt>FLAG_SOFT_KEYBOARD</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.KeyEvent.KEYCODE_MEDIA_FAST_FORWARD"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/KeyEvent.html#KEYCODE_MEDIA_FAST_FORWARD" target="_top"><xfont size="+1"><tt>KEYCODE_MEDIA_FAST_FORWARD</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.KeyEvent.KEYCODE_MEDIA_NEXT"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/KeyEvent.html#KEYCODE_MEDIA_NEXT" target="_top"><xfont size="+1"><tt>KEYCODE_MEDIA_NEXT</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/KeyEvent.html#KEYCODE_MEDIA_PLAY_PAUSE" target="_top"><xfont size="+1"><tt>KEYCODE_MEDIA_PLAY_PAUSE</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.KeyEvent.KEYCODE_MEDIA_PREVIOUS"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/KeyEvent.html#KEYCODE_MEDIA_PREVIOUS" target="_top"><xfont size="+1"><tt>KEYCODE_MEDIA_PREVIOUS</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.KeyEvent.KEYCODE_MEDIA_REWIND"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/KeyEvent.html#KEYCODE_MEDIA_REWIND" target="_top"><xfont size="+1"><tt>KEYCODE_MEDIA_REWIND</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.KeyEvent.KEYCODE_MEDIA_STOP"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/KeyEvent.html#KEYCODE_MEDIA_STOP" target="_top"><xfont size="+1"><tt>KEYCODE_MEDIA_STOP</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.KeyEvent.KEYCODE_MUTE"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/KeyEvent.html#KEYCODE_MUTE" target="_top"><xfont size="+1"><tt>KEYCODE_MUTE</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=3>Changed Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.KeyEvent.MAX_KEYCODE"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/KeyEvent.html#MAX_KEYCODE" target="_top"><xfont size="+1"><tt>MAX_KEYCODE</tt></font></A></nobr>  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.view.Menu.html b/docs/html/sdk/api_diff/3/changes/android.view.Menu.html
new file mode 100644
index 000000000000..09b910a42688
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.view.Menu.html
@@ -0,0 +1,130 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.view.Menu
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Interface android.view.<A HREF="../../../../reference/android/view/Menu.html" target="_top"><font size="+3"><tt>Menu</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.Menu.close_added()"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/view/Menu.html#close()" target="_top"><xfont size="+1"><tt>close</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.Menu.getItem_added(int)"></A>
+  <nobr><code>MenuItem</code>&nbsp;<A HREF="../../../../reference/android/view/Menu.html#getItem(int)" target="_top"><xfont size="+1"><tt>getItem</tt></font></A>(<code>int</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.view.MotionEvent.html b/docs/html/sdk/api_diff/3/changes/android.view.MotionEvent.html
new file mode 100644
index 000000000000..5291df778213
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.view.MotionEvent.html
@@ -0,0 +1,123 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.view.MotionEvent
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.view.<A HREF="../../../../reference/android/view/MotionEvent.html" target="_top"><font size="+3"><tt>MotionEvent</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<a NAME="fields"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.MotionEvent.ACTION_OUTSIDE"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/MotionEvent.html#ACTION_OUTSIDE" target="_top"><xfont size="+1"><tt>ACTION_OUTSIDE</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.view.OrientationListener.html b/docs/html/sdk/api_diff/3/changes/android.view.OrientationListener.html
new file mode 100644
index 000000000000..ac58489da46a
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.view.OrientationListener.html
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.view.OrientationListener
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.view.<A HREF="../../../../reference/android/view/OrientationListener.html" target="_top"><font size="+3"><tt>OrientationListener</tt></font></A>
+</H2>
+<p><b>Now deprecated</b>.<br>
+<a NAME="constructors"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Constructors" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Constructors</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.OrientationListener.ctor_added(android.content.Context, int)"></A>
+  <nobr><A HREF="../../../../reference/android/view/OrientationListener.html#OrientationListener(android.content.Context, int)" target="_top"><xfont size="+1"><tt>OrientationListener</tt></font></A>(<code>Context,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="methods"></a>
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.view.View.html b/docs/html/sdk/api_diff/3/changes/android.view.View.html
new file mode 100644
index 000000000000..ccd58a9d2c8a
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.view.View.html
@@ -0,0 +1,257 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.view.View
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.view.<A HREF="../../../../reference/android/view/View.html" target="_top"><font size="+3"><tt>View</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.View.checkInputConnectionProxy_added(android.view.View)"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/view/View.html#checkInputConnectionProxy(android.view.View)" target="_top"><xfont size="+1"><tt>checkInputConnectionProxy</tt></font></A>(<code>View</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.View.dispatchKeyEventPreIme_added(android.view.KeyEvent)"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/view/View.html#dispatchKeyEventPreIme(android.view.KeyEvent)" target="_top"><xfont size="+1"><tt>dispatchKeyEventPreIme</tt></font></A>(<code>KeyEvent</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.View.getWindowVisibleDisplayFrame_added(android.graphics.Rect)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/view/View.html#getWindowVisibleDisplayFrame(android.graphics.Rect)" target="_top"><xfont size="+1"><tt>getWindowVisibleDisplayFrame</tt></font></A>(<code>Rect</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.View.isHapticFeedbackEnabled_added()"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/view/View.html#isHapticFeedbackEnabled()" target="_top"><xfont size="+1"><tt>isHapticFeedbackEnabled</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.View.isInEditMode_added()"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/view/View.html#isInEditMode()" target="_top"><xfont size="+1"><tt>isInEditMode</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.View.onCheckIsTextEditor_added()"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/view/View.html#onCheckIsTextEditor()" target="_top"><xfont size="+1"><tt>onCheckIsTextEditor</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.View.onCreateInputConnection_added(android.view.inputmethod.EditorInfo)"></A>
+  <nobr><code>InputConnection</code>&nbsp;<A HREF="../../../../reference/android/view/View.html#onCreateInputConnection(android.view.inputmethod.EditorInfo)" target="_top"><xfont size="+1"><tt>onCreateInputConnection</tt></font></A>(<code>EditorInfo</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.View.onFinishTemporaryDetach_added()"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/view/View.html#onFinishTemporaryDetach()" target="_top"><xfont size="+1"><tt>onFinishTemporaryDetach</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.View.onKeyPreIme_added(int, android.view.KeyEvent)"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/view/View.html#onKeyPreIme(int, android.view.KeyEvent)" target="_top"><xfont size="+1"><tt>onKeyPreIme</tt></font></A>(<code>int,</nobr> KeyEvent<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.View.onStartTemporaryDetach_added()"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/view/View.html#onStartTemporaryDetach()" target="_top"><xfont size="+1"><tt>onStartTemporaryDetach</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.View.performHapticFeedback_added(int)"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/view/View.html#performHapticFeedback(int)" target="_top"><xfont size="+1"><tt>performHapticFeedback</tt></font></A>(<code>int</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.View.performHapticFeedback_added(int, int)"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/view/View.html#performHapticFeedback(int, int)" target="_top"><xfont size="+1"><tt>performHapticFeedback</tt></font></A>(<code>int,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.View.setHapticFeedbackEnabled_added(boolean)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/view/View.html#setHapticFeedbackEnabled(boolean)" target="_top"><xfont size="+1"><tt>setHapticFeedbackEnabled</tt></font></A>(<code>boolean</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.View.setScrollContainer_added(boolean)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/view/View.html#setScrollContainer(boolean)" target="_top"><xfont size="+1"><tt>setScrollContainer</tt></font></A>(<code>boolean</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=3>Changed Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.View.getHandler_changed()"></A>
+  <nobr><code>Handler</code>&nbsp;<A HREF="../../../../reference/android/view/View.html#getHandler()" target="_top"><xfont size="+1"><tt>getHandler</tt></font></A>()  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+Change of visibility from protected to public.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.View.playSoundEffect_changed(int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/view/View.html#playSoundEffect(int)" target="_top"><xfont size="+1"><tt>playSoundEffect</tt></font></A>(<code>int</code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+Change of visibility from protected to public.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.View.HAPTIC_FEEDBACK_ENABLED"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/View.html#HAPTIC_FEEDBACK_ENABLED" target="_top"><xfont size="+1"><tt>HAPTIC_FEEDBACK_ENABLED</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.view.ViewConfiguration.html b/docs/html/sdk/api_diff/3/changes/android.view.ViewConfiguration.html
new file mode 100644
index 000000000000..0bf487c289d7
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.view.ViewConfiguration.html
@@ -0,0 +1,282 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.view.ViewConfiguration
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.view.<A HREF="../../../../reference/android/view/ViewConfiguration.html" target="_top"><font size="+3"><tt>ViewConfiguration</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Constructors" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=3>Changed Constructors</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.ViewConfiguration.ctor_changed()"></A>
+  <nobr><A HREF="../../../../reference/android/view/ViewConfiguration.html#ViewConfiguration()" target="_top"><xfont size="+1"><tt>ViewConfiguration</tt></font></A>()  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.ViewConfiguration.get_added(android.content.Context)"></A>
+  <nobr><code>ViewConfiguration</code>&nbsp;<A HREF="../../../../reference/android/view/ViewConfiguration.html#get(android.content.Context)" target="_top"><xfont size="+1"><tt>get</tt></font></A>(<code>Context</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.ViewConfiguration.getDoubleTapTimeout_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/ViewConfiguration.html#getDoubleTapTimeout()" target="_top"><xfont size="+1"><tt>getDoubleTapTimeout</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.ViewConfiguration.getScaledDoubleTapSlop_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/ViewConfiguration.html#getScaledDoubleTapSlop()" target="_top"><xfont size="+1"><tt>getScaledDoubleTapSlop</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.ViewConfiguration.getScaledEdgeSlop_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/ViewConfiguration.html#getScaledEdgeSlop()" target="_top"><xfont size="+1"><tt>getScaledEdgeSlop</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.ViewConfiguration.getScaledFadingEdgeLength_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/ViewConfiguration.html#getScaledFadingEdgeLength()" target="_top"><xfont size="+1"><tt>getScaledFadingEdgeLength</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.ViewConfiguration.getScaledMaximumDrawingCacheSize_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/ViewConfiguration.html#getScaledMaximumDrawingCacheSize()" target="_top"><xfont size="+1"><tt>getScaledMaximumDrawingCacheSize</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.ViewConfiguration.getScaledMinimumFlingVelocity_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/ViewConfiguration.html#getScaledMinimumFlingVelocity()" target="_top"><xfont size="+1"><tt>getScaledMinimumFlingVelocity</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.ViewConfiguration.getScaledScrollBarSize_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/ViewConfiguration.html#getScaledScrollBarSize()" target="_top"><xfont size="+1"><tt>getScaledScrollBarSize</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.ViewConfiguration.getScaledTouchSlop_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/ViewConfiguration.html#getScaledTouchSlop()" target="_top"><xfont size="+1"><tt>getScaledTouchSlop</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.ViewConfiguration.getScaledWindowTouchSlop_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/ViewConfiguration.html#getScaledWindowTouchSlop()" target="_top"><xfont size="+1"><tt>getScaledWindowTouchSlop</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=3>Changed Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.ViewConfiguration.getEdgeSlop_changed()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/ViewConfiguration.html#getEdgeSlop()" target="_top"><xfont size="+1"><tt>getEdgeSlop</tt></font></A>()  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.ViewConfiguration.getFadingEdgeLength_changed()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/ViewConfiguration.html#getFadingEdgeLength()" target="_top"><xfont size="+1"><tt>getFadingEdgeLength</tt></font></A>()  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.ViewConfiguration.getMaximumDrawingCacheSize_changed()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/ViewConfiguration.html#getMaximumDrawingCacheSize()" target="_top"><xfont size="+1"><tt>getMaximumDrawingCacheSize</tt></font></A>()  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.ViewConfiguration.getMinimumFlingVelocity_changed()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/ViewConfiguration.html#getMinimumFlingVelocity()" target="_top"><xfont size="+1"><tt>getMinimumFlingVelocity</tt></font></A>()  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.ViewConfiguration.getScrollBarSize_changed()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/ViewConfiguration.html#getScrollBarSize()" target="_top"><xfont size="+1"><tt>getScrollBarSize</tt></font></A>()  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.ViewConfiguration.getTouchSlop_changed()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/ViewConfiguration.html#getTouchSlop()" target="_top"><xfont size="+1"><tt>getTouchSlop</tt></font></A>()  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.ViewConfiguration.getWindowTouchSlop_changed()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/ViewConfiguration.html#getWindowTouchSlop()" target="_top"><xfont size="+1"><tt>getWindowTouchSlop</tt></font></A>()  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.view.ViewDebug.html b/docs/html/sdk/api_diff/3/changes/android.view.ViewDebug.html
new file mode 100644
index 000000000000..17c0c8a34ebe
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.view.ViewDebug.html
@@ -0,0 +1,123 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.view.ViewDebug
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.view.<A HREF="../../../../reference/android/view/ViewDebug.html" target="_top"><font size="+3"><tt>ViewDebug</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.ViewDebug.dumpCapturedView_added(java.lang.String, java.lang.Object)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/view/ViewDebug.html#dumpCapturedView(java.lang.String, java.lang.Object)" target="_top"><xfont size="+1"><tt>dumpCapturedView</tt></font></A>(<code>String,</nobr> Object<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.view.ViewGroup.html b/docs/html/sdk/api_diff/3/changes/android.view.ViewGroup.html
new file mode 100644
index 000000000000..589f266ff2cf
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.view.ViewGroup.html
@@ -0,0 +1,123 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.view.ViewGroup
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.view.<A HREF="../../../../reference/android/view/ViewGroup.html" target="_top"><font size="+3"><tt>ViewGroup</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.ViewGroup.setStaticTransformationsEnabled_added(boolean)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/view/ViewGroup.html#setStaticTransformationsEnabled(boolean)" target="_top"><xfont size="+1"><tt>setStaticTransformationsEnabled</tt></font></A>(<code>boolean</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.view.ViewParent.html b/docs/html/sdk/api_diff/3/changes/android.view.ViewParent.html
new file mode 100644
index 000000000000..536e7e95c4fd
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.view.ViewParent.html
@@ -0,0 +1,123 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.view.ViewParent
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Interface android.view.<A HREF="../../../../reference/android/view/ViewParent.html" target="_top"><font size="+3"><tt>ViewParent</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.ViewParent.requestChildRectangleOnScreen_added(android.view.View, android.graphics.Rect, boolean)"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/view/ViewParent.html#requestChildRectangleOnScreen(android.view.View, android.graphics.Rect, boolean)" target="_top"><xfont size="+1"><tt>requestChildRectangleOnScreen</tt></font></A>(<code>View,</nobr> Rect<nobr>,</nobr> boolean<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.view.ViewTreeObserver.html b/docs/html/sdk/api_diff/3/changes/android.view.ViewTreeObserver.html
new file mode 100644
index 000000000000..41753a737d44
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.view.ViewTreeObserver.html
@@ -0,0 +1,130 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.view.ViewTreeObserver
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.view.<A HREF="../../../../reference/android/view/ViewTreeObserver.html" target="_top"><font size="+3"><tt>ViewTreeObserver</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.ViewTreeObserver.addOnScrollChangedListener_added(android.view.ViewTreeObserver.OnScrollChangedListener)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/view/ViewTreeObserver.html#addOnScrollChangedListener(android.view.ViewTreeObserver.OnScrollChangedListener)" target="_top"><xfont size="+1"><tt>addOnScrollChangedListener</tt></font></A>(<code>OnScrollChangedListener</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.ViewTreeObserver.removeOnScrollChangedListener_added(android.view.ViewTreeObserver.OnScrollChangedListener)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/view/ViewTreeObserver.html#removeOnScrollChangedListener(android.view.ViewTreeObserver.OnScrollChangedListener)" target="_top"><xfont size="+1"><tt>removeOnScrollChangedListener</tt></font></A>(<code>OnScrollChangedListener</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.view.Window.html b/docs/html/sdk/api_diff/3/changes/android.view.Window.html
new file mode 100644
index 000000000000..d84eb2b11810
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.view.Window.html
@@ -0,0 +1,137 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.view.Window
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.view.<A HREF="../../../../reference/android/view/Window.html" target="_top"><font size="+3"><tt>Window</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.Window.hasSoftInputMode_added()"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/view/Window.html#hasSoftInputMode()" target="_top"><xfont size="+1"><tt>hasSoftInputMode</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.Window.setSoftInputMode_added(int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/view/Window.html#setSoftInputMode(int)" target="_top"><xfont size="+1"><tt>setSoftInputMode</tt></font></A>(<code>int</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.Window.setWindowAnimations_added(int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/view/Window.html#setWindowAnimations(int)" target="_top"><xfont size="+1"><tt>setWindowAnimations</tt></font></A>(<code>int</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.view.WindowManager.LayoutParams.html b/docs/html/sdk/api_diff/3/changes/android.view.WindowManager.LayoutParams.html
new file mode 100644
index 000000000000..7304b0ea7876
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.view.WindowManager.LayoutParams.html
@@ -0,0 +1,292 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.view.WindowManager.LayoutParams
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.view.<A HREF="../../../../reference/android/view/WindowManager.LayoutParams.html" target="_top"><font size="+3"><tt>WindowManager.LayoutParams</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.WindowManager.LayoutParams.mayUseInputMethod_added(int)"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/view/WindowManager.LayoutParams.html#mayUseInputMethod(int)" target="_top"><xfont size="+1"><tt>mayUseInputMethod</tt></font></A>(<code>int</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/WindowManager.LayoutParams.html#FLAG_ALT_FOCUSABLE_IM" target="_top"><xfont size="+1"><tt>FLAG_ALT_FOCUSABLE_IM</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/WindowManager.LayoutParams.html#FLAG_WATCH_OUTSIDE_TOUCH" target="_top"><xfont size="+1"><tt>FLAG_WATCH_OUTSIDE_TOUCH</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.WindowManager.LayoutParams.SCREEN_BRIGHTNESS_CHANGED"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/WindowManager.LayoutParams.html#SCREEN_BRIGHTNESS_CHANGED" target="_top"><xfont size="+1"><tt>SCREEN_BRIGHTNESS_CHANGED</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.WindowManager.LayoutParams.SCREEN_ORIENTATION_CHANGED"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/WindowManager.LayoutParams.html#SCREEN_ORIENTATION_CHANGED" target="_top"><xfont size="+1"><tt>SCREEN_ORIENTATION_CHANGED</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/WindowManager.LayoutParams.html#SOFT_INPUT_ADJUST_PAN" target="_top"><xfont size="+1"><tt>SOFT_INPUT_ADJUST_PAN</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/WindowManager.LayoutParams.html#SOFT_INPUT_ADJUST_RESIZE" target="_top"><xfont size="+1"><tt>SOFT_INPUT_ADJUST_RESIZE</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.WindowManager.LayoutParams.SOFT_INPUT_ADJUST_UNSPECIFIED"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/WindowManager.LayoutParams.html#SOFT_INPUT_ADJUST_UNSPECIFIED" target="_top"><xfont size="+1"><tt>SOFT_INPUT_ADJUST_UNSPECIFIED</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.WindowManager.LayoutParams.SOFT_INPUT_IS_FORWARD_NAVIGATION"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/WindowManager.LayoutParams.html#SOFT_INPUT_IS_FORWARD_NAVIGATION" target="_top"><xfont size="+1"><tt>SOFT_INPUT_IS_FORWARD_NAVIGATION</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.WindowManager.LayoutParams.SOFT_INPUT_MASK_ADJUST"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/WindowManager.LayoutParams.html#SOFT_INPUT_MASK_ADJUST" target="_top"><xfont size="+1"><tt>SOFT_INPUT_MASK_ADJUST</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.WindowManager.LayoutParams.SOFT_INPUT_MASK_STATE"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/WindowManager.LayoutParams.html#SOFT_INPUT_MASK_STATE" target="_top"><xfont size="+1"><tt>SOFT_INPUT_MASK_STATE</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.WindowManager.LayoutParams.SOFT_INPUT_MODE_CHANGED"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/WindowManager.LayoutParams.html#SOFT_INPUT_MODE_CHANGED" target="_top"><xfont size="+1"><tt>SOFT_INPUT_MODE_CHANGED</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/WindowManager.LayoutParams.html#SOFT_INPUT_STATE_ALWAYS_HIDDEN" target="_top"><xfont size="+1"><tt>SOFT_INPUT_STATE_ALWAYS_HIDDEN</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/WindowManager.LayoutParams.html#SOFT_INPUT_STATE_ALWAYS_VISIBLE" target="_top"><xfont size="+1"><tt>SOFT_INPUT_STATE_ALWAYS_VISIBLE</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/WindowManager.LayoutParams.html#SOFT_INPUT_STATE_HIDDEN" target="_top"><xfont size="+1"><tt>SOFT_INPUT_STATE_HIDDEN</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_UNCHANGED"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/WindowManager.LayoutParams.html#SOFT_INPUT_STATE_UNCHANGED" target="_top"><xfont size="+1"><tt>SOFT_INPUT_STATE_UNCHANGED</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_UNSPECIFIED"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/WindowManager.LayoutParams.html#SOFT_INPUT_STATE_UNSPECIFIED" target="_top"><xfont size="+1"><tt>SOFT_INPUT_STATE_UNSPECIFIED</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/WindowManager.LayoutParams.html#SOFT_INPUT_STATE_VISIBLE" target="_top"><xfont size="+1"><tt>SOFT_INPUT_STATE_VISIBLE</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.WindowManager.LayoutParams.TYPE_APPLICATION_ATTACHED_DIALOG"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/WindowManager.LayoutParams.html#TYPE_APPLICATION_ATTACHED_DIALOG" target="_top"><xfont size="+1"><tt>TYPE_APPLICATION_ATTACHED_DIALOG</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/WindowManager.LayoutParams.html#TYPE_INPUT_METHOD" target="_top"><xfont size="+1"><tt>TYPE_INPUT_METHOD</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD_DIALOG"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/WindowManager.LayoutParams.html#TYPE_INPUT_METHOD_DIALOG" target="_top"><xfont size="+1"><tt>TYPE_INPUT_METHOD_DIALOG</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.WindowManager.LayoutParams.screenBrightness"></A>
+  <nobr><code>float</code>&nbsp;<A HREF="../../../../reference/android/view/WindowManager.LayoutParams.html#screenBrightness" target="_top"><xfont size="+1"><tt>screenBrightness</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.WindowManager.LayoutParams.screenOrientation"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/WindowManager.LayoutParams.html#screenOrientation" target="_top"><xfont size="+1"><tt>screenOrientation</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.WindowManager.LayoutParams.softInputMode"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/view/WindowManager.LayoutParams.html#softInputMode" target="_top"><xfont size="+1"><tt>softInputMode</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.view.animation.Animation.html b/docs/html/sdk/api_diff/3/changes/android.view.animation.Animation.html
new file mode 100644
index 000000000000..9cdf434cb74e
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.view.animation.Animation.html
@@ -0,0 +1,138 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.view.animation.Animation
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.view.animation.<A HREF="../../../../reference/android/view/animation/Animation.html" target="_top"><font size="+3"><tt>Animation</tt></font></A>
+</H2>
+<p><font xsize="+1">Added interface <code>java.lang.Cloneable</code>.<br></font>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.animation.Animation.computeDurationHint_added()"></A>
+  <nobr><code>long</code>&nbsp;<A HREF="../../../../reference/android/view/animation/Animation.html#computeDurationHint()" target="_top"><xfont size="+1"><tt>computeDurationHint</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.animation.Animation.isFillEnabled_added()"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/view/animation/Animation.html#isFillEnabled()" target="_top"><xfont size="+1"><tt>isFillEnabled</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.animation.Animation.setFillEnabled_added(boolean)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/view/animation/Animation.html#setFillEnabled(boolean)" target="_top"><xfont size="+1"><tt>setFillEnabled</tt></font></A>(<code>boolean</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.view.animation.Transformation.html b/docs/html/sdk/api_diff/3/changes/android.view.animation.Transformation.html
new file mode 100644
index 000000000000..8c5cbf55cf32
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.view.animation.Transformation.html
@@ -0,0 +1,123 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.view.animation.Transformation
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.view.animation.<A HREF="../../../../reference/android/view/animation/Transformation.html" target="_top"><font size="+3"><tt>Transformation</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.animation.Transformation.toShortString_added()"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/view/animation/Transformation.html#toShortString()" target="_top"><xfont size="+1"><tt>toShortString</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.webkit.URLUtil.html b/docs/html/sdk/api_diff/3/changes/android.webkit.URLUtil.html
new file mode 100644
index 000000000000..cff874168f2d
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.webkit.URLUtil.html
@@ -0,0 +1,126 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.webkit.URLUtil
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.webkit.<A HREF="../../../../reference/android/webkit/URLUtil.html" target="_top"><font size="+3"><tt>URLUtil</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=3>Changed Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.webkit.URLUtil.isCookielessProxyUrl_changed(java.lang.String)"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/webkit/URLUtil.html#isCookielessProxyUrl(java.lang.String)" target="_top"><xfont size="+1"><tt>isCookielessProxyUrl</tt></font></A>(<code>String</code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.webkit.UrlInterceptHandler.html b/docs/html/sdk/api_diff/3/changes/android.webkit.UrlInterceptHandler.html
new file mode 100644
index 000000000000..8664bc6e18f7
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.webkit.UrlInterceptHandler.html
@@ -0,0 +1,141 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.webkit.UrlInterceptHandler
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Interface android.webkit.<A HREF="../../../../reference/android/webkit/UrlInterceptHandler.html" target="_top"><font size="+3"><tt>UrlInterceptHandler</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.webkit.UrlInterceptHandler.getPluginData_added(java.lang.String, java.util.Map<java.lang.String, java.lang.String>)"></A>
+  <nobr><code>PluginData</code>&nbsp;<A HREF="../../../../reference/android/webkit/UrlInterceptHandler.html#getPluginData(java.lang.String, java.util.Map<java.lang.String, java.lang.String>)" target="_top"><xfont size="+1"><tt>getPluginData</tt></font></A>(<code>String,</nobr> Map&lt;String<nobr>,</nobr> String&gt;<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=3>Changed Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.webkit.UrlInterceptHandler.service_changed(java.lang.String, java.util.Map<java.lang.String, java.lang.String>)"></A>
+  <nobr><code>CacheResult</code>&nbsp;<A HREF="../../../../reference/android/webkit/UrlInterceptHandler.html#service(java.lang.String, java.util.Map<java.lang.String, java.lang.String>)" target="_top"><xfont size="+1"><tt>service</tt></font></A>(<code>String,</nobr> Map&lt;String<nobr>,</nobr> String&gt;<nobr><nobr></code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.webkit.UrlInterceptRegistry.html b/docs/html/sdk/api_diff/3/changes/android.webkit.UrlInterceptRegistry.html
new file mode 100644
index 000000000000..09d11496ddf4
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.webkit.UrlInterceptRegistry.html
@@ -0,0 +1,141 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.webkit.UrlInterceptRegistry
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.webkit.<A HREF="../../../../reference/android/webkit/UrlInterceptRegistry.html" target="_top"><font size="+3"><tt>UrlInterceptRegistry</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.webkit.UrlInterceptRegistry.getPluginData_added(java.lang.String, java.util.Map<java.lang.String, java.lang.String>)"></A>
+  <nobr><code>PluginData</code>&nbsp;<A HREF="../../../../reference/android/webkit/UrlInterceptRegistry.html#getPluginData(java.lang.String, java.util.Map<java.lang.String, java.lang.String>)" target="_top"><xfont size="+1"><tt>getPluginData</tt></font></A>(<code>String,</nobr> Map&lt;String<nobr>,</nobr> String&gt;<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=3>Changed Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.webkit.UrlInterceptRegistry.getSurrogate_changed(java.lang.String, java.util.Map<java.lang.String, java.lang.String>)"></A>
+  <nobr><code>CacheResult</code>&nbsp;<A HREF="../../../../reference/android/webkit/UrlInterceptRegistry.html#getSurrogate(java.lang.String, java.util.Map<java.lang.String, java.lang.String>)" target="_top"><xfont size="+1"><tt>getSurrogate</tt></font></A>(<code>String,</nobr> Map&lt;String<nobr>,</nobr> String&gt;<nobr><nobr></code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.webkit.WebHistoryItem.html b/docs/html/sdk/api_diff/3/changes/android.webkit.WebHistoryItem.html
new file mode 100644
index 000000000000..10140196bb07
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.webkit.WebHistoryItem.html
@@ -0,0 +1,123 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.webkit.WebHistoryItem
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.webkit.<A HREF="../../../../reference/android/webkit/WebHistoryItem.html" target="_top"><font size="+3"><tt>WebHistoryItem</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.webkit.WebHistoryItem.getOriginalUrl_added()"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/webkit/WebHistoryItem.html#getOriginalUrl()" target="_top"><xfont size="+1"><tt>getOriginalUrl</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.webkit.WebSettings.html b/docs/html/sdk/api_diff/3/changes/android.webkit.WebSettings.html
new file mode 100644
index 000000000000..eb421cf63ad7
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.webkit.WebSettings.html
@@ -0,0 +1,186 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.webkit.WebSettings
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.webkit.<A HREF="../../../../reference/android/webkit/WebSettings.html" target="_top"><font size="+3"><tt>WebSettings</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.webkit.WebSettings.getAllowFileAccess_added()"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/webkit/WebSettings.html#getAllowFileAccess()" target="_top"><xfont size="+1"><tt>getAllowFileAccess</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.webkit.WebSettings.getBuiltInZoomControls_added()"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/webkit/WebSettings.html#getBuiltInZoomControls()" target="_top"><xfont size="+1"><tt>getBuiltInZoomControls</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.webkit.WebSettings.getUserAgentString_added()"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/webkit/WebSettings.html#getUserAgentString()" target="_top"><xfont size="+1"><tt>getUserAgentString</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.webkit.WebSettings.setAllowFileAccess_added(boolean)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/webkit/WebSettings.html#setAllowFileAccess(boolean)" target="_top"><xfont size="+1"><tt>setAllowFileAccess</tt></font></A>(<code>boolean</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.webkit.WebSettings.setBuiltInZoomControls_added(boolean)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/webkit/WebSettings.html#setBuiltInZoomControls(boolean)" target="_top"><xfont size="+1"><tt>setBuiltInZoomControls</tt></font></A>(<code>boolean</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.webkit.WebSettings.setUserAgentString_added(java.lang.String)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/webkit/WebSettings.html#setUserAgentString(java.lang.String)" target="_top"><xfont size="+1"><tt>setUserAgentString</tt></font></A>(<code>String</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=3>Changed Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.webkit.WebSettings.getUserAgent_changed()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/webkit/WebSettings.html#getUserAgent()" target="_top"><xfont size="+1"><tt>getUserAgent</tt></font></A>()  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.webkit.WebSettings.setUserAgent_changed(int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/webkit/WebSettings.html#setUserAgent(int)" target="_top"><xfont size="+1"><tt>setUserAgent</tt></font></A>(<code>int</code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.webkit.WebView.html b/docs/html/sdk/api_diff/3/changes/android.webkit.WebView.html
new file mode 100644
index 000000000000..cd721c8fdfff
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.webkit.WebView.html
@@ -0,0 +1,193 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.webkit.WebView
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.webkit.<A HREF="../../../../reference/android/webkit/WebView.html" target="_top"><font size="+3"><tt>WebView</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.webkit.WebView.clearMatches_added()"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/webkit/WebView.html#clearMatches()" target="_top"><xfont size="+1"><tt>clearMatches</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.webkit.WebView.findAll_added(java.lang.String)"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/webkit/WebView.html#findAll(java.lang.String)" target="_top"><xfont size="+1"><tt>findAll</tt></font></A>(<code>String</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.webkit.WebView.findNext_added(boolean)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/webkit/WebView.html#findNext(boolean)" target="_top"><xfont size="+1"><tt>findNext</tt></font></A>(<code>boolean</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.webkit.WebView.getOriginalUrl_added()"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/webkit/WebView.html#getOriginalUrl()" target="_top"><xfont size="+1"><tt>getOriginalUrl</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.webkit.WebView.restorePicture_added(android.os.Bundle, java.io.File)"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/webkit/WebView.html#restorePicture(android.os.Bundle, java.io.File)" target="_top"><xfont size="+1"><tt>restorePicture</tt></font></A>(<code>Bundle,</nobr> File<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.webkit.WebView.savePicture_added(android.os.Bundle, java.io.File)"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/webkit/WebView.html#savePicture(android.os.Bundle, java.io.File)" target="_top"><xfont size="+1"><tt>savePicture</tt></font></A>(<code>Bundle,</nobr> File<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.webkit.WebView.setNetworkAvailable_added(boolean)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/webkit/WebView.html#setNetworkAvailable(boolean)" target="_top"><xfont size="+1"><tt>setNetworkAvailable</tt></font></A>(<code>boolean</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=3>Changed Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.webkit.WebView.getZoomControls_changed()"></A>
+  <nobr><code>View</code>&nbsp;<A HREF="../../../../reference/android/webkit/WebView.html#getZoomControls()" target="_top"><xfont size="+1"><tt>getZoomControls</tt></font></A>()  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.webkit.WebView.onGlobalFocusChanged_changed(android.view.View, android.view.View)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/webkit/WebView.html#onGlobalFocusChanged(android.view.View, android.view.View)" target="_top"><xfont size="+1"><tt>onGlobalFocusChanged</tt></font></A>(<code>View,</nobr> View<nobr><nobr></code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.widget.AbsListView.html b/docs/html/sdk/api_diff/3/changes/android.widget.AbsListView.html
new file mode 100644
index 000000000000..6d1ed3535a44
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.widget.AbsListView.html
@@ -0,0 +1,151 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.widget.AbsListView
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.widget.<A HREF="../../../../reference/android/widget/AbsListView.html" target="_top"><font size="+3"><tt>AbsListView</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.AbsListView.getTextFilter_added()"></A>
+  <nobr><code>CharSequence</code>&nbsp;<A HREF="../../../../reference/android/widget/AbsListView.html#getTextFilter()" target="_top"><xfont size="+1"><tt>getTextFilter</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.AbsListView.isFastScrollEnabled_added()"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/widget/AbsListView.html#isFastScrollEnabled()" target="_top"><xfont size="+1"><tt>isFastScrollEnabled</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.AbsListView.isSmoothScrollbarEnabled_added()"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/widget/AbsListView.html#isSmoothScrollbarEnabled()" target="_top"><xfont size="+1"><tt>isSmoothScrollbarEnabled</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.AbsListView.setFastScrollEnabled_added(boolean)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/widget/AbsListView.html#setFastScrollEnabled(boolean)" target="_top"><xfont size="+1"><tt>setFastScrollEnabled</tt></font></A>(<code>boolean</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.AbsListView.setSmoothScrollbarEnabled_added(boolean)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/widget/AbsListView.html#setSmoothScrollbarEnabled(boolean)" target="_top"><xfont size="+1"><tt>setSmoothScrollbarEnabled</tt></font></A>(<code>boolean</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.widget.AbsSeekBar.html b/docs/html/sdk/api_diff/3/changes/android.widget.AbsSeekBar.html
new file mode 100644
index 000000000000..128b31f182e9
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.widget.AbsSeekBar.html
@@ -0,0 +1,130 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.widget.AbsSeekBar
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.widget.<A HREF="../../../../reference/android/widget/AbsSeekBar.html" target="_top"><font size="+3"><tt>AbsSeekBar</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.AbsSeekBar.getKeyProgressIncrement_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/widget/AbsSeekBar.html#getKeyProgressIncrement()" target="_top"><xfont size="+1"><tt>getKeyProgressIncrement</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.AbsSeekBar.setKeyProgressIncrement_added(int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/widget/AbsSeekBar.html#setKeyProgressIncrement(int)" target="_top"><xfont size="+1"><tt>setKeyProgressIncrement</tt></font></A>(<code>int</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.widget.AbsoluteLayout.html b/docs/html/sdk/api_diff/3/changes/android.widget.AbsoluteLayout.html
new file mode 100644
index 000000000000..77025f08c08e
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.widget.AbsoluteLayout.html
@@ -0,0 +1,109 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.widget.AbsoluteLayout
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.widget.<A HREF="../../../../reference/android/widget/AbsoluteLayout.html" target="_top"><font size="+3"><tt>AbsoluteLayout</tt></font></A>
+</H2>
+<p><b>Now deprecated</b>.<br>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.widget.ArrayAdapter.html b/docs/html/sdk/api_diff/3/changes/android.widget.ArrayAdapter.html
new file mode 100644
index 000000000000..0beed263f3fb
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.widget.ArrayAdapter.html
@@ -0,0 +1,123 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.widget.ArrayAdapter
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.widget.<A HREF="../../../../reference/android/widget/ArrayAdapter.html" target="_top"><font size="+3"><tt>ArrayAdapter</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.ArrayAdapter.sort_added(java.util.Comparator<? super T>)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/widget/ArrayAdapter.html#sort(java.util.Comparator<? super T>)" target="_top"><xfont size="+1"><tt>sort</tt></font></A>(<code>Comparator&lt;? super T&gt;</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.widget.AutoCompleteTextView.html b/docs/html/sdk/api_diff/3/changes/android.widget.AutoCompleteTextView.html
new file mode 100644
index 000000000000..a6e89e41b564
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.widget.AutoCompleteTextView.html
@@ -0,0 +1,214 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.widget.AutoCompleteTextView
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.widget.<A HREF="../../../../reference/android/widget/AutoCompleteTextView.html" target="_top"><font size="+3"><tt>AutoCompleteTextView</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.AutoCompleteTextView.clearListSelection_added()"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/widget/AutoCompleteTextView.html#clearListSelection()" target="_top"><xfont size="+1"><tt>clearListSelection</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.AutoCompleteTextView.getDropDownAnchor_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/widget/AutoCompleteTextView.html#getDropDownAnchor()" target="_top"><xfont size="+1"><tt>getDropDownAnchor</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.AutoCompleteTextView.getDropDownWidth_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/widget/AutoCompleteTextView.html#getDropDownWidth()" target="_top"><xfont size="+1"><tt>getDropDownWidth</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.AutoCompleteTextView.getListSelection_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/widget/AutoCompleteTextView.html#getListSelection()" target="_top"><xfont size="+1"><tt>getListSelection</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.AutoCompleteTextView.getOnItemClickListener_added()"></A>
+  <nobr><code>OnItemClickListener</code>&nbsp;<A HREF="../../../../reference/android/widget/AutoCompleteTextView.html#getOnItemClickListener()" target="_top"><xfont size="+1"><tt>getOnItemClickListener</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.AutoCompleteTextView.getOnItemSelectedListener_added()"></A>
+  <nobr><code>OnItemSelectedListener</code>&nbsp;<A HREF="../../../../reference/android/widget/AutoCompleteTextView.html#getOnItemSelectedListener()" target="_top"><xfont size="+1"><tt>getOnItemSelectedListener</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.AutoCompleteTextView.isPerformingCompletion_added()"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/widget/AutoCompleteTextView.html#isPerformingCompletion()" target="_top"><xfont size="+1"><tt>isPerformingCompletion</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.AutoCompleteTextView.setDropDownAnchor_added(int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/widget/AutoCompleteTextView.html#setDropDownAnchor(int)" target="_top"><xfont size="+1"><tt>setDropDownAnchor</tt></font></A>(<code>int</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.AutoCompleteTextView.setDropDownWidth_added(int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/widget/AutoCompleteTextView.html#setDropDownWidth(int)" target="_top"><xfont size="+1"><tt>setDropDownWidth</tt></font></A>(<code>int</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.AutoCompleteTextView.setListSelection_added(int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/widget/AutoCompleteTextView.html#setListSelection(int)" target="_top"><xfont size="+1"><tt>setListSelection</tt></font></A>(<code>int</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=3>Changed Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.AutoCompleteTextView.getItemClickListener_changed()"></A>
+  <nobr><code>OnItemClickListener</code>&nbsp;<A HREF="../../../../reference/android/widget/AutoCompleteTextView.html#getItemClickListener()" target="_top"><xfont size="+1"><tt>getItemClickListener</tt></font></A>()  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.AutoCompleteTextView.getItemSelectedListener_changed()"></A>
+  <nobr><code>OnItemSelectedListener</code>&nbsp;<A HREF="../../../../reference/android/widget/AutoCompleteTextView.html#getItemSelectedListener()" target="_top"><xfont size="+1"><tt>getItemSelectedListener</tt></font></A>()  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.widget.Chronometer.html b/docs/html/sdk/api_diff/3/changes/android.widget.Chronometer.html
new file mode 100644
index 000000000000..2a82a201933a
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.widget.Chronometer.html
@@ -0,0 +1,130 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.widget.Chronometer
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.widget.<A HREF="../../../../reference/android/widget/Chronometer.html" target="_top"><font size="+3"><tt>Chronometer</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.Chronometer.getOnChronometerTickListener_added()"></A>
+  <nobr><code>OnChronometerTickListener</code>&nbsp;<A HREF="../../../../reference/android/widget/Chronometer.html#getOnChronometerTickListener()" target="_top"><xfont size="+1"><tt>getOnChronometerTickListener</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.Chronometer.setOnChronometerTickListener_added(android.widget.Chronometer.OnChronometerTickListener)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/widget/Chronometer.html#setOnChronometerTickListener(android.widget.Chronometer.OnChronometerTickListener)" target="_top"><xfont size="+1"><tt>setOnChronometerTickListener</tt></font></A>(<code>OnChronometerTickListener</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.widget.CursorAdapter.html b/docs/html/sdk/api_diff/3/changes/android.widget.CursorAdapter.html
new file mode 100644
index 000000000000..0a890300efd1
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.widget.CursorAdapter.html
@@ -0,0 +1,161 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.widget.CursorAdapter
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.widget.<A HREF="../../../../reference/android/widget/CursorAdapter.html" target="_top"><font size="+3"><tt>CursorAdapter</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.CursorAdapter.onContentChanged_added()"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/widget/CursorAdapter.html#onContentChanged()" target="_top"><xfont size="+1"><tt>onContentChanged</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=3>Changed Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.CursorAdapter.getCount_changed()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/widget/CursorAdapter.html#getCount()" target="_top"><xfont size="+1"><tt>getCount</tt></font></A>()  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+Change from final to non-final.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.CursorAdapter.getItem_changed(int)"></A>
+  <nobr><code>Object</code>&nbsp;<A HREF="../../../../reference/android/widget/CursorAdapter.html#getItem(int)" target="_top"><xfont size="+1"><tt>getItem</tt></font></A>(<code>int</code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+Change from final to non-final.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.CursorAdapter.getItemId_changed(int)"></A>
+  <nobr><code>long</code>&nbsp;<A HREF="../../../../reference/android/widget/CursorAdapter.html#getItemId(int)" target="_top"><xfont size="+1"><tt>getItemId</tt></font></A>(<code>int</code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+Change from final to non-final.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.widget.GridView.html b/docs/html/sdk/api_diff/3/changes/android.widget.GridView.html
new file mode 100644
index 000000000000..86e019ba9ce0
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.widget.GridView.html
@@ -0,0 +1,123 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.widget.GridView
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.widget.<A HREF="../../../../reference/android/widget/GridView.html" target="_top"><font size="+3"><tt>GridView</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<a NAME="fields"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.GridView.STRETCH_SPACING_UNIFORM"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/widget/GridView.html#STRETCH_SPACING_UNIFORM" target="_top"><xfont size="+1"><tt>STRETCH_SPACING_UNIFORM</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.widget.ListView.html b/docs/html/sdk/api_diff/3/changes/android.widget.ListView.html
new file mode 100644
index 000000000000..ecaf3096e598
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.widget.ListView.html
@@ -0,0 +1,130 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.widget.ListView
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.widget.<A HREF="../../../../reference/android/widget/ListView.html" target="_top"><font size="+3"><tt>ListView</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.ListView.setFooterDividersEnabled_added(boolean)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/widget/ListView.html#setFooterDividersEnabled(boolean)" target="_top"><xfont size="+1"><tt>setFooterDividersEnabled</tt></font></A>(<code>boolean</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.ListView.setHeaderDividersEnabled_added(boolean)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/widget/ListView.html#setHeaderDividersEnabled(boolean)" target="_top"><xfont size="+1"><tt>setHeaderDividersEnabled</tt></font></A>(<code>boolean</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.widget.PopupWindow.OnDismissListener.html b/docs/html/sdk/api_diff/3/changes/android.widget.PopupWindow.OnDismissListener.html
new file mode 100644
index 000000000000..2e08886708b9
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.widget.PopupWindow.OnDismissListener.html
@@ -0,0 +1,109 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.widget.PopupWindow.OnDismissListener
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Interface android.widget.<A HREF="../../../../reference/android/widget/PopupWindow.OnDismissListener.html" target="_top"><font size="+3"><tt>PopupWindow.OnDismissListener</tt></font></A>
+</H2>
+<p>Change of visibility from  to public.<br>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.widget.PopupWindow.html b/docs/html/sdk/api_diff/3/changes/android.widget.PopupWindow.html
new file mode 100644
index 000000000000..b3a33037a77e
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.widget.PopupWindow.html
@@ -0,0 +1,243 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.widget.PopupWindow
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.widget.<A HREF="../../../../reference/android/widget/PopupWindow.html" target="_top"><font size="+3"><tt>PopupWindow</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.PopupWindow.getInputMethodMode_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/widget/PopupWindow.html#getInputMethodMode()" target="_top"><xfont size="+1"><tt>getInputMethodMode</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.PopupWindow.getMaxAvailableHeight_added(android.view.View, int)"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/widget/PopupWindow.html#getMaxAvailableHeight(android.view.View, int)" target="_top"><xfont size="+1"><tt>getMaxAvailableHeight</tt></font></A>(<code>View,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.PopupWindow.isAboveAnchor_added()"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/widget/PopupWindow.html#isAboveAnchor()" target="_top"><xfont size="+1"><tt>isAboveAnchor</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.PopupWindow.isClippingEnabled_added()"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/widget/PopupWindow.html#isClippingEnabled()" target="_top"><xfont size="+1"><tt>isClippingEnabled</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.PopupWindow.isOutsideTouchable_added()"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/widget/PopupWindow.html#isOutsideTouchable()" target="_top"><xfont size="+1"><tt>isOutsideTouchable</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.PopupWindow.isTouchable_added()"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/widget/PopupWindow.html#isTouchable()" target="_top"><xfont size="+1"><tt>isTouchable</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.PopupWindow.setClippingEnabled_added(boolean)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/widget/PopupWindow.html#setClippingEnabled(boolean)" target="_top"><xfont size="+1"><tt>setClippingEnabled</tt></font></A>(<code>boolean</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.PopupWindow.setInputMethodMode_added(int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/widget/PopupWindow.html#setInputMethodMode(int)" target="_top"><xfont size="+1"><tt>setInputMethodMode</tt></font></A>(<code>int</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.PopupWindow.setOutsideTouchable_added(boolean)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/widget/PopupWindow.html#setOutsideTouchable(boolean)" target="_top"><xfont size="+1"><tt>setOutsideTouchable</tt></font></A>(<code>boolean</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.PopupWindow.setTouchInterceptor_added(android.view.View.OnTouchListener)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/widget/PopupWindow.html#setTouchInterceptor(android.view.View.OnTouchListener)" target="_top"><xfont size="+1"><tt>setTouchInterceptor</tt></font></A>(<code>OnTouchListener</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.PopupWindow.setTouchable_added(boolean)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/widget/PopupWindow.html#setTouchable(boolean)" target="_top"><xfont size="+1"><tt>setTouchable</tt></font></A>(<code>boolean</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.PopupWindow.setWindowLayoutMode_added(int, int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/widget/PopupWindow.html#setWindowLayoutMode(int, int)" target="_top"><xfont size="+1"><tt>setWindowLayoutMode</tt></font></A>(<code>int,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.PopupWindow.update_added()"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/widget/PopupWindow.html#update()" target="_top"><xfont size="+1"><tt>update</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.PopupWindow.update_added(int, int, int, int, boolean)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/widget/PopupWindow.html#update(int, int, int, int, boolean)" target="_top"><xfont size="+1"><tt>update</tt></font></A>(<code>int,</nobr> int<nobr>,</nobr> int<nobr>,</nobr> int<nobr>,</nobr> boolean<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.PopupWindow.INPUT_METHOD_FROM_FOCUSABLE"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/widget/PopupWindow.html#INPUT_METHOD_FROM_FOCUSABLE" target="_top"><xfont size="+1"><tt>INPUT_METHOD_FROM_FOCUSABLE</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.PopupWindow.INPUT_METHOD_NEEDED"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/widget/PopupWindow.html#INPUT_METHOD_NEEDED" target="_top"><xfont size="+1"><tt>INPUT_METHOD_NEEDED</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.PopupWindow.INPUT_METHOD_NOT_NEEDED"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/widget/PopupWindow.html#INPUT_METHOD_NOT_NEEDED" target="_top"><xfont size="+1"><tt>INPUT_METHOD_NOT_NEEDED</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.widget.ProgressBar.html b/docs/html/sdk/api_diff/3/changes/android.widget.ProgressBar.html
new file mode 100644
index 000000000000..eea94f2b5e04
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.widget.ProgressBar.html
@@ -0,0 +1,136 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.widget.ProgressBar
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.widget.<A HREF="../../../../reference/android/widget/ProgressBar.html" target="_top"><font size="+3"><tt>ProgressBar</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=3>Changed Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.ProgressBar.onRestoreInstanceState_changed(android.os.Parcelable)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/widget/ProgressBar.html#onRestoreInstanceState(android.os.Parcelable)" target="_top"><xfont size="+1"><tt>onRestoreInstanceState</tt></font></A>(<code>Parcelable</code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+Method was inherited from <tt>android.view.View</tt>, but is now defined locally. Change of visibility from protected to public.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.ProgressBar.onSaveInstanceState_changed()"></A>
+  <nobr><code>Parcelable</code>&nbsp;<A HREF="../../../../reference/android/widget/ProgressBar.html#onSaveInstanceState()" target="_top"><xfont size="+1"><tt>onSaveInstanceState</tt></font></A>()  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+Method was inherited from <tt>android.view.View</tt>, but is now defined locally. Change of visibility from protected to public.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.widget.RemoteViews.ActionException.html b/docs/html/sdk/api_diff/3/changes/android.widget.RemoteViews.ActionException.html
new file mode 100644
index 000000000000..c2f5c9623291
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.widget.RemoteViews.ActionException.html
@@ -0,0 +1,123 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.widget.RemoteViews.ActionException
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.widget.<A HREF="../../../../reference/android/widget/RemoteViews.ActionException.html" target="_top"><font size="+3"><tt>RemoteViews.ActionException</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Constructors" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Constructors</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.RemoteViews.ActionException.ctor_added(java.lang.Exception)"></A>
+  <nobr><A HREF="../../../../reference/android/widget/RemoteViews.ActionException.html#RemoteViews.ActionException(java.lang.Exception)" target="_top"><xfont size="+1"><tt>RemoteViews.ActionException</tt></font></A>(<code>Exception</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="methods"></a>
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.widget.RemoteViews.html b/docs/html/sdk/api_diff/3/changes/android.widget.RemoteViews.html
new file mode 100644
index 000000000000..ef8eb0826080
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.widget.RemoteViews.html
@@ -0,0 +1,221 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.widget.RemoteViews
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.widget.<A HREF="../../../../reference/android/widget/RemoteViews.html" target="_top"><font size="+3"><tt>RemoteViews</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.RemoteViews.setBitmap_added(int, java.lang.String, android.graphics.Bitmap)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/widget/RemoteViews.html#setBitmap(int, java.lang.String, android.graphics.Bitmap)" target="_top"><xfont size="+1"><tt>setBitmap</tt></font></A>(<code>int,</nobr> String<nobr>,</nobr> Bitmap<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.RemoteViews.setBoolean_added(int, java.lang.String, boolean)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/widget/RemoteViews.html#setBoolean(int, java.lang.String, boolean)" target="_top"><xfont size="+1"><tt>setBoolean</tt></font></A>(<code>int,</nobr> String<nobr>,</nobr> boolean<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.RemoteViews.setByte_added(int, java.lang.String, byte)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/widget/RemoteViews.html#setByte(int, java.lang.String, byte)" target="_top"><xfont size="+1"><tt>setByte</tt></font></A>(<code>int,</nobr> String<nobr>,</nobr> byte<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.RemoteViews.setChar_added(int, java.lang.String, char)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/widget/RemoteViews.html#setChar(int, java.lang.String, char)" target="_top"><xfont size="+1"><tt>setChar</tt></font></A>(<code>int,</nobr> String<nobr>,</nobr> char<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.RemoteViews.setCharSequence_added(int, java.lang.String, java.lang.CharSequence)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/widget/RemoteViews.html#setCharSequence(int, java.lang.String, java.lang.CharSequence)" target="_top"><xfont size="+1"><tt>setCharSequence</tt></font></A>(<code>int,</nobr> String<nobr>,</nobr> CharSequence<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.RemoteViews.setDouble_added(int, java.lang.String, double)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/widget/RemoteViews.html#setDouble(int, java.lang.String, double)" target="_top"><xfont size="+1"><tt>setDouble</tt></font></A>(<code>int,</nobr> String<nobr>,</nobr> double<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.RemoteViews.setFloat_added(int, java.lang.String, float)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/widget/RemoteViews.html#setFloat(int, java.lang.String, float)" target="_top"><xfont size="+1"><tt>setFloat</tt></font></A>(<code>int,</nobr> String<nobr>,</nobr> float<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.RemoteViews.setImageViewBitmap_added(int, android.graphics.Bitmap)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/widget/RemoteViews.html#setImageViewBitmap(int, android.graphics.Bitmap)" target="_top"><xfont size="+1"><tt>setImageViewBitmap</tt></font></A>(<code>int,</nobr> Bitmap<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.RemoteViews.setInt_added(int, java.lang.String, int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/widget/RemoteViews.html#setInt(int, java.lang.String, int)" target="_top"><xfont size="+1"><tt>setInt</tt></font></A>(<code>int,</nobr> String<nobr>,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.RemoteViews.setLong_added(int, java.lang.String, long)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/widget/RemoteViews.html#setLong(int, java.lang.String, long)" target="_top"><xfont size="+1"><tt>setLong</tt></font></A>(<code>int,</nobr> String<nobr>,</nobr> long<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.RemoteViews.setOnClickPendingIntent_added(int, android.app.PendingIntent)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/widget/RemoteViews.html#setOnClickPendingIntent(int, android.app.PendingIntent)" target="_top"><xfont size="+1"><tt>setOnClickPendingIntent</tt></font></A>(<code>int,</nobr> PendingIntent<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.RemoteViews.setShort_added(int, java.lang.String, short)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/widget/RemoteViews.html#setShort(int, java.lang.String, short)" target="_top"><xfont size="+1"><tt>setShort</tt></font></A>(<code>int,</nobr> String<nobr>,</nobr> short<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.RemoteViews.setString_added(int, java.lang.String, java.lang.String)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/widget/RemoteViews.html#setString(int, java.lang.String, java.lang.String)" target="_top"><xfont size="+1"><tt>setString</tt></font></A>(<code>int,</nobr> String<nobr>,</nobr> String<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.RemoteViews.setTextColor_added(int, int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/widget/RemoteViews.html#setTextColor(int, int)" target="_top"><xfont size="+1"><tt>setTextColor</tt></font></A>(<code>int,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.RemoteViews.setUri_added(int, java.lang.String, android.net.Uri)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/widget/RemoteViews.html#setUri(int, java.lang.String, android.net.Uri)" target="_top"><xfont size="+1"><tt>setUri</tt></font></A>(<code>int,</nobr> String<nobr>,</nobr> Uri<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.widget.ResourceCursorAdapter.html b/docs/html/sdk/api_diff/3/changes/android.widget.ResourceCursorAdapter.html
new file mode 100644
index 000000000000..cee8f59b3d29
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.widget.ResourceCursorAdapter.html
@@ -0,0 +1,138 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.widget.ResourceCursorAdapter
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.widget.<A HREF="../../../../reference/android/widget/ResourceCursorAdapter.html" target="_top"><font size="+3"><tt>ResourceCursorAdapter</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Constructors" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Constructors</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.ResourceCursorAdapter.ctor_added(android.content.Context, int, android.database.Cursor, boolean)"></A>
+  <nobr><A HREF="../../../../reference/android/widget/ResourceCursorAdapter.html#ResourceCursorAdapter(android.content.Context, int, android.database.Cursor, boolean)" target="_top"><xfont size="+1"><tt>ResourceCursorAdapter</tt></font></A>(<code>Context,</nobr> int<nobr>,</nobr> Cursor<nobr>,</nobr> boolean<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.ResourceCursorAdapter.setViewResource_added(int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/widget/ResourceCursorAdapter.html#setViewResource(int)" target="_top"><xfont size="+1"><tt>setViewResource</tt></font></A>(<code>int</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.widget.Scroller.html b/docs/html/sdk/api_diff/3/changes/android.widget.Scroller.html
new file mode 100644
index 000000000000..e5b524df6658
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.widget.Scroller.html
@@ -0,0 +1,130 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.widget.Scroller
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.widget.<A HREF="../../../../reference/android/widget/Scroller.html" target="_top"><font size="+3"><tt>Scroller</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.Scroller.getStartX_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/widget/Scroller.html#getStartX()" target="_top"><xfont size="+1"><tt>getStartX</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.Scroller.getStartY_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/widget/Scroller.html#getStartY()" target="_top"><xfont size="+1"><tt>getStartY</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.widget.SimpleCursorAdapter.html b/docs/html/sdk/api_diff/3/changes/android.widget.SimpleCursorAdapter.html
new file mode 100644
index 000000000000..63b7b132902c
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.widget.SimpleCursorAdapter.html
@@ -0,0 +1,123 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.widget.SimpleCursorAdapter
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.widget.<A HREF="../../../../reference/android/widget/SimpleCursorAdapter.html" target="_top"><font size="+3"><tt>SimpleCursorAdapter</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.SimpleCursorAdapter.changeCursorAndColumns_added(android.database.Cursor, java.lang.String[], int[])"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/widget/SimpleCursorAdapter.html#changeCursorAndColumns(android.database.Cursor, java.lang.String[], int[])" target="_top"><xfont size="+1"><tt>changeCursorAndColumns</tt></font></A>(<code>Cursor,</nobr> String[]<nobr>,</nobr> int[]<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/android.widget.TextView.html b/docs/html/sdk/api_diff/3/changes/android.widget.TextView.html
new file mode 100644
index 000000000000..42ecdc9f58fa
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/android.widget.TextView.html
@@ -0,0 +1,333 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.widget.TextView
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class android.widget.<A HREF="../../../../reference/android/widget/TextView.html" target="_top"><font size="+3"><tt>TextView</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.TextView.beginBatchEdit_added()"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/widget/TextView.html#beginBatchEdit()" target="_top"><xfont size="+1"><tt>beginBatchEdit</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.TextView.bringPointIntoView_added(int)"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/widget/TextView.html#bringPointIntoView(int)" target="_top"><xfont size="+1"><tt>bringPointIntoView</tt></font></A>(<code>int</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.TextView.clearComposingText_added()"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/widget/TextView.html#clearComposingText()" target="_top"><xfont size="+1"><tt>clearComposingText</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.TextView.didTouchFocusSelect_added()"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/widget/TextView.html#didTouchFocusSelect()" target="_top"><xfont size="+1"><tt>didTouchFocusSelect</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.TextView.endBatchEdit_added()"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/widget/TextView.html#endBatchEdit()" target="_top"><xfont size="+1"><tt>endBatchEdit</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.TextView.extractText_added(android.view.inputmethod.ExtractedTextRequest, android.view.inputmethod.ExtractedText)"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/widget/TextView.html#extractText(android.view.inputmethod.ExtractedTextRequest, android.view.inputmethod.ExtractedText)" target="_top"><xfont size="+1"><tt>extractText</tt></font></A>(<code>ExtractedTextRequest,</nobr> ExtractedText<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.TextView.getEditableText_added()"></A>
+  <nobr><code>Editable</code>&nbsp;<A HREF="../../../../reference/android/widget/TextView.html#getEditableText()" target="_top"><xfont size="+1"><tt>getEditableText</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.TextView.getImeActionId_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/widget/TextView.html#getImeActionId()" target="_top"><xfont size="+1"><tt>getImeActionId</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.TextView.getImeActionLabel_added()"></A>
+  <nobr><code>CharSequence</code>&nbsp;<A HREF="../../../../reference/android/widget/TextView.html#getImeActionLabel()" target="_top"><xfont size="+1"><tt>getImeActionLabel</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.TextView.getImeOptions_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/widget/TextView.html#getImeOptions()" target="_top"><xfont size="+1"><tt>getImeOptions</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.TextView.getInputExtras_added(boolean)"></A>
+  <nobr><code>Bundle</code>&nbsp;<A HREF="../../../../reference/android/widget/TextView.html#getInputExtras(boolean)" target="_top"><xfont size="+1"><tt>getInputExtras</tt></font></A>(<code>boolean</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.TextView.getInputType_added()"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/widget/TextView.html#getInputType()" target="_top"><xfont size="+1"><tt>getInputType</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.TextView.getPrivateImeOptions_added()"></A>
+  <nobr><code>String</code>&nbsp;<A HREF="../../../../reference/android/widget/TextView.html#getPrivateImeOptions()" target="_top"><xfont size="+1"><tt>getPrivateImeOptions</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.TextView.isInputMethodTarget_added()"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/widget/TextView.html#isInputMethodTarget()" target="_top"><xfont size="+1"><tt>isInputMethodTarget</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.TextView.moveCursorToVisibleOffset_added()"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/widget/TextView.html#moveCursorToVisibleOffset()" target="_top"><xfont size="+1"><tt>moveCursorToVisibleOffset</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.TextView.onBeginBatchEdit_added()"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/widget/TextView.html#onBeginBatchEdit()" target="_top"><xfont size="+1"><tt>onBeginBatchEdit</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.TextView.onCommitCompletion_added(android.view.inputmethod.CompletionInfo)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/widget/TextView.html#onCommitCompletion(android.view.inputmethod.CompletionInfo)" target="_top"><xfont size="+1"><tt>onCommitCompletion</tt></font></A>(<code>CompletionInfo</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.TextView.onEditorAction_added(int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/widget/TextView.html#onEditorAction(int)" target="_top"><xfont size="+1"><tt>onEditorAction</tt></font></A>(<code>int</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.TextView.onEndBatchEdit_added()"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/widget/TextView.html#onEndBatchEdit()" target="_top"><xfont size="+1"><tt>onEndBatchEdit</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.TextView.onPrivateIMECommand_added(java.lang.String, android.os.Bundle)"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/widget/TextView.html#onPrivateIMECommand(java.lang.String, android.os.Bundle)" target="_top"><xfont size="+1"><tt>onPrivateIMECommand</tt></font></A>(<code>String,</nobr> Bundle<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.TextView.onSelectionChanged_added(int, int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/widget/TextView.html#onSelectionChanged(int, int)" target="_top"><xfont size="+1"><tt>onSelectionChanged</tt></font></A>(<code>int,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.TextView.onTextContextMenuItem_added(int)"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/android/widget/TextView.html#onTextContextMenuItem(int)" target="_top"><xfont size="+1"><tt>onTextContextMenuItem</tt></font></A>(<code>int</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.TextView.setCompoundDrawablesWithIntrinsicBounds_added(int, int, int, int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/widget/TextView.html#setCompoundDrawablesWithIntrinsicBounds(int, int, int, int)" target="_top"><xfont size="+1"><tt>setCompoundDrawablesWithIntrinsicBounds</tt></font></A>(<code>int,</nobr> int<nobr>,</nobr> int<nobr>,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.TextView.setExtractedText_added(android.view.inputmethod.ExtractedText)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/widget/TextView.html#setExtractedText(android.view.inputmethod.ExtractedText)" target="_top"><xfont size="+1"><tt>setExtractedText</tt></font></A>(<code>ExtractedText</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.TextView.setImeActionLabel_added(java.lang.CharSequence, int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/widget/TextView.html#setImeActionLabel(java.lang.CharSequence, int)" target="_top"><xfont size="+1"><tt>setImeActionLabel</tt></font></A>(<code>CharSequence,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.TextView.setImeOptions_added(int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/widget/TextView.html#setImeOptions(int)" target="_top"><xfont size="+1"><tt>setImeOptions</tt></font></A>(<code>int</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.TextView.setInputExtras_added(int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/widget/TextView.html#setInputExtras(int)" target="_top"><xfont size="+1"><tt>setInputExtras</tt></font></A>(<code>int</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.TextView.setInputType_added(int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/widget/TextView.html#setInputType(int)" target="_top"><xfont size="+1"><tt>setInputType</tt></font></A>(<code>int</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.TextView.setOnEditorActionListener_added(android.widget.TextView.OnEditorActionListener)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/widget/TextView.html#setOnEditorActionListener(android.widget.TextView.OnEditorActionListener)" target="_top"><xfont size="+1"><tt>setOnEditorActionListener</tt></font></A>(<code>OnEditorActionListener</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.TextView.setPrivateImeOptions_added(java.lang.String)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/widget/TextView.html#setPrivateImeOptions(java.lang.String)" target="_top"><xfont size="+1"><tt>setPrivateImeOptions</tt></font></A>(<code>String</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget.TextView.setRawInputType_added(int)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/android/widget/TextView.html#setRawInputType(int)" target="_top"><xfont size="+1"><tt>setRawInputType</tt></font></A>(<code>int</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/changes-summary.html b/docs/html/sdk/api_diff/3/changes/changes-summary.html
new file mode 100644
index 000000000000..bf52a9658076
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/changes-summary.html
@@ -0,0 +1,451 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+Android API Differences Report
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<body class="gc-documentation">
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+    <div id="docTitleContainer">
+<h1>Android&nbsp;API&nbsp;Differences&nbsp;Report</h1>
+<p>This report details the changes in the core Android framework API between two API Level 
+specifications. It shows additions, modifications, and removals for packages, classes, methods, and fields. 
+The report also includes general statistics that characterize the extent and type of the differences.</p>
+<p>This report is based a comparison of the Android API specifications 
+whose API Level identifiers are given in the upper-right corner of this page. It compares a 
+newer "to" API to an older "from" API, noting all changes relative to the 
+older API. So, for example, API elements marked as removed are no longer present in the "to" 
+API specification.</p>
+<p>To navigate the report, use the "Select a Diffs Index" and "Filter the Index" 
+controls on the left. The report uses text formatting to indicate <em>interface names</em>, 
+<a href= ><tt>links to reference documentation</tt></a>, and <a href= >links to change 
+description</a>. The statistics are accessible from the "Statistics" link in the upper-right corner.</p>
+<p>For more information about the Android framework API and SDK, 
+see the <a href="http://developer.android.com/index.html" target="_top">Android Developers site</a>.</p>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Packages" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Packages</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.appwidget"></A>
+  <nobr><A HREF="../../../../reference/android/appwidget/package-summary.html" target="_top"><xfont size="+1"><tt>android.appwidget</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.inputmethodservice"></A>
+  <nobr><A HREF="../../../../reference/android/inputmethodservice/package-summary.html" target="_top"><xfont size="+1"><tt>android.inputmethodservice</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.speech"></A>
+  <nobr><A HREF="../../../../reference/android/speech/package-summary.html" target="_top"><xfont size="+1"><tt>android.speech</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.format"></A>
+  <nobr><A HREF="../../../../reference/android/text/format/package-summary.html" target="_top"><xfont size="+1"><tt>android.text.format</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.inputmethod"></A>
+  <nobr><A HREF="../../../../reference/android/view/inputmethod/package-summary.html" target="_top"><xfont size="+1"><tt>android.view.inputmethod</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="java.beans"></A>
+  <nobr><A HREF="../../../../reference/java/beans/package-summary.html" target="_top"><xfont size="+1"><tt>java.beans</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Packages" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=3>Changed Packages</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android"></A>
+  <nobr><A HREF="pkg_android.html">android</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.app"></A>
+  <nobr><A HREF="pkg_android.app.html">android.app</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content"></A>
+  <nobr><A HREF="pkg_android.content.html">android.content</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.pm"></A>
+  <nobr><A HREF="pkg_android.content.pm.html">android.content.pm</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.content.res"></A>
+  <nobr><A HREF="pkg_android.content.res.html">android.content.res</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.database"></A>
+  <nobr><A HREF="pkg_android.database.html">android.database</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.database.sqlite"></A>
+  <nobr><A HREF="pkg_android.database.sqlite.html">android.database.sqlite</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.graphics"></A>
+  <nobr><A HREF="pkg_android.graphics.html">android.graphics</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.graphics.drawable"></A>
+  <nobr><A HREF="pkg_android.graphics.drawable.html">android.graphics.drawable</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.graphics.drawable.shapes"></A>
+  <nobr><A HREF="pkg_android.graphics.drawable.shapes.html">android.graphics.drawable.shapes</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.hardware"></A>
+  <nobr><A HREF="pkg_android.hardware.html">android.hardware</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.location"></A>
+  <nobr><A HREF="pkg_android.location.html">android.location</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.media"></A>
+  <nobr><A HREF="pkg_android.media.html">android.media</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.net"></A>
+  <nobr><A HREF="pkg_android.net.html">android.net</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.net.wifi"></A>
+  <nobr><A HREF="pkg_android.net.wifi.html">android.net.wifi</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.opengl"></A>
+  <nobr><A HREF="pkg_android.opengl.html">android.opengl</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.os"></A>
+  <nobr><A HREF="pkg_android.os.html">android.os</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.preference"></A>
+  <nobr><A HREF="pkg_android.preference.html">android.preference</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.provider"></A>
+  <nobr><A HREF="pkg_android.provider.html">android.provider</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.telephony"></A>
+  <nobr><A HREF="pkg_android.telephony.html">android.telephony</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.telephony.gsm"></A>
+  <nobr><A HREF="pkg_android.telephony.gsm.html">android.telephony.gsm</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.test"></A>
+  <nobr><A HREF="pkg_android.test.html">android.test</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.test.mock"></A>
+  <nobr><A HREF="pkg_android.test.mock.html">android.test.mock</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.test.suitebuilder"></A>
+  <nobr><A HREF="pkg_android.test.suitebuilder.html">android.test.suitebuilder</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text"></A>
+  <nobr><A HREF="pkg_android.text.html">android.text</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.method"></A>
+  <nobr><A HREF="pkg_android.text.method.html">android.text.method</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.text.style"></A>
+  <nobr><A HREF="pkg_android.text.style.html">android.text.style</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.util"></A>
+  <nobr><A HREF="pkg_android.util.html">android.util</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view"></A>
+  <nobr><A HREF="pkg_android.view.html">android.view</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.view.animation"></A>
+  <nobr><A HREF="pkg_android.view.animation.html">android.view.animation</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.webkit"></A>
+  <nobr><A HREF="pkg_android.webkit.html">android.webkit</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="android.widget"></A>
+  <nobr><A HREF="pkg_android.widget.html">android.widget</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="dalvik.system"></A>
+  <nobr><A HREF="pkg_dalvik.system.html">dalvik.system</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="java.lang"></A>
+  <nobr><A HREF="pkg_java.lang.html">java.lang</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="java.lang.reflect"></A>
+  <nobr><A HREF="pkg_java.lang.reflect.html">java.lang.reflect</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="java.net"></A>
+  <nobr><A HREF="pkg_java.net.html">java.net</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="java.util"></A>
+  <nobr><A HREF="pkg_java.util.html">java.util</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="java.util.jar"></A>
+  <nobr><A HREF="pkg_java.util.jar.html">java.util.jar</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="java.util.logging"></A>
+  <nobr><A HREF="pkg_java.util.logging.html">java.util.logging</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<!-- End of API section -->
+<!-- Start of packages section -->
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/classes_index_additions.html b/docs/html/sdk/api_diff/3/changes/classes_index_additions.html
new file mode 100644
index 000000000000..32a68e3117fd
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/classes_index_additions.html
@@ -0,0 +1,469 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+Class Additions Index
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY class="gc-documentation">
+<a NAME="topheader"></a>
+<table summary="Index for Classes" width="100%" class="jdiffIndex" border="0" cellspacing="0" cellpadding="0" style="padding-bottom:0;margin-bottom:0;">
+  <tr>
+  <th class="indexHeader">
+    Filter the Index:
+  </th>
+  </tr>
+  <tr>
+  <td class="indexText" style="line-height:1.3em;padding-left:2em;">
+<a href="classes_index_all.html" class="staysblack">All Classes</a>
+  <br>
+<font color="#999999">Removals</font>
+  <br>
+<b>Additions</b>
+  <br>
+<A HREF="classes_index_changes.html"xclass="hiddenlink">Changes</A>
+  </td>
+  </tr>
+</table>
+<div id="indexTableCaption">
+<font size="-2"><strong>Bold</strong>&nbsp;indicates&nbsp;New;&nbsp;<strike>Strike</strike>&nbsp;indicates&nbsp;deleted. Plain indicates changed.</font>
+</div>
+<A NAME="A"></A>
+<br><font size="+2">A</font>&nbsp;
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="pkg_android.test.html#ActivityInstrumentationTestCase2" class="hiddenlink" target="rightframe"><b>ActivityInstrumentationTestCase2</b></A><br>
+<A HREF="pkg_android.app.html#ActivityManager.RunningAppProcessInfo" class="hiddenlink" target="rightframe"><b>ActivityManager.RunningAppProcessInfo</b></A><br>
+<A HREF="pkg_android.widget.html#AlphabetIndexer" class="hiddenlink" target="rightframe"><b>AlphabetIndexer</b></A><br>
+<A HREF="pkg_android.content.res.html#AssetFileDescriptor.AutoCloseInputStream" class="hiddenlink" target="rightframe"><b>AssetFileDescriptor.AutoCloseInputStream</b></A><br>
+<A HREF="pkg_android.content.res.html#AssetFileDescriptor.AutoCloseOutputStream" class="hiddenlink" target="rightframe"><b>AssetFileDescriptor.AutoCloseOutputStream</b></A><br>
+<A HREF="pkg_android.os.html#AsyncTask" class="hiddenlink" target="rightframe"><b>AsyncTask</b></A><br>
+<A HREF="pkg_android.os.html#AsyncTask.Status" class="hiddenlink" target="rightframe"><b>AsyncTask.Status</b></A><br>
+<A HREF="pkg_android.media.html#AudioFormat" class="hiddenlink" target="rightframe"><b>AudioFormat</b></A><br>
+<A HREF="pkg_android.media.html#AudioRecord" class="hiddenlink" target="rightframe"><b>AudioRecord</b></A><br>
+<A HREF="pkg_android.media.html#AudioRecord.OnRecordPositionUpdateListener" class="hiddenlink" target="rightframe"><b><i>AudioRecord.OnRecordPositionUpdateListener</i></b></A><br>
+<A HREF="pkg_android.media.html#AudioTrack" class="hiddenlink" target="rightframe"><b>AudioTrack</b></A><br>
+<A HREF="pkg_android.media.html#AudioTrack.OnPlaybackPositionUpdateListener" class="hiddenlink" target="rightframe"><b><i>AudioTrack.OnPlaybackPositionUpdateListener</i></b></A><br>
+<A NAME="C"></A>
+<br><font size="+2">C</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="pkg_android.widget.html#Chronometer.OnChronometerTickListener" class="hiddenlink" target="rightframe"><b><i>Chronometer.OnChronometerTickListener</i></b></A><br>
+<A HREF="pkg_android.content.pm.html#ConfigurationInfo" class="hiddenlink" target="rightframe"><b>ConfigurationInfo</b></A><br>
+<A NAME="D"></A>
+<br><font size="+2">D</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="pkg_dalvik.system.html#DexClassLoader" class="hiddenlink" target="rightframe"><b>DexClassLoader</b></A><br>
+<A NAME="G"></A>
+<br><font size="+2">G</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="pkg_android.hardware.html#GeomagneticField" class="hiddenlink" target="rightframe"><b>GeomagneticField</b></A><br>
+<A HREF="pkg_android.view.html#GestureDetector.OnDoubleTapListener" class="hiddenlink" target="rightframe"><b><i>GestureDetector.OnDoubleTapListener</i></b></A><br>
+<A HREF="pkg_android.opengl.html#GLSurfaceView" class="hiddenlink" target="rightframe"><b>GLSurfaceView</b></A><br>
+<A HREF="pkg_android.opengl.html#GLSurfaceView.EGLConfigChooser" class="hiddenlink" target="rightframe"><b><i>GLSurfaceView.EGLConfigChooser</i></b></A><br>
+<A HREF="pkg_android.opengl.html#GLSurfaceView.GLWrapper" class="hiddenlink" target="rightframe"><b><i>GLSurfaceView.GLWrapper</i></b></A><br>
+<A HREF="pkg_android.opengl.html#GLSurfaceView.Renderer" class="hiddenlink" target="rightframe"><b><i>GLSurfaceView.Renderer</i></b></A><br>
+<A HREF="pkg_android.location.html#GpsSatellite" class="hiddenlink" target="rightframe"><b>GpsSatellite</b></A><br>
+<A HREF="pkg_android.location.html#GpsStatus" class="hiddenlink" target="rightframe"><b>GpsStatus</b></A><br>
+<A HREF="pkg_android.location.html#GpsStatus.Listener" class="hiddenlink" target="rightframe"><b><i>GpsStatus.Listener</i></b></A><br>
+<A NAME="H"></A>
+<br><font size="+2">H</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="pkg_android.os.html#Handler.Callback" class="hiddenlink" target="rightframe"><b><i>Handler.Callback</i></b></A><br>
+<A HREF="pkg_android.view.html#HapticFeedbackConstants" class="hiddenlink" target="rightframe"><b>HapticFeedbackConstants</b></A><br>
+<A HREF="pkg_android.widget.html#HorizontalScrollView" class="hiddenlink" target="rightframe"><b>HorizontalScrollView</b></A><br>
+<A NAME="I"></A>
+<br><font size="+2">I</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="pkg_android.text.html#InputType" class="hiddenlink" target="rightframe"><b><i>InputType</i></b></A><br>
+<A HREF="pkg_android.app.html#IntentService" class="hiddenlink" target="rightframe"><b>IntentService</b></A><br>
+<A NAME="J"></A>
+<br><font size="+2">J</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="pkg_android.media.html#JetPlayer" class="hiddenlink" target="rightframe"><b>JetPlayer</b></A><br>
+<A HREF="pkg_android.media.html#JetPlayer.OnJetEventListener" class="hiddenlink" target="rightframe"><b><i>JetPlayer.OnJetEventListener</i></b></A><br>
+<A NAME="L"></A>
+<br><font size="+2">L</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="pkg_android.app.html#LauncherActivity.IconResizer" class="hiddenlink" target="rightframe"><b>LauncherActivity.IconResizer</b></A><br>
+<A HREF="pkg_android.app.html#LauncherActivity.ListItem" class="hiddenlink" target="rightframe"><b>LauncherActivity.ListItem</b></A><br>
+<A HREF="pkg_android.provider.html#LiveFolders" class="hiddenlink" target="rightframe"><b>LiveFolders</b></A><br>
+<A NAME="M"></A>
+<br><font size="+2">M</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="pkg_android.media.html#MediaPlayer.OnInfoListener" class="hiddenlink" target="rightframe"><b><i>MediaPlayer.OnInfoListener</i></b></A><br>
+<A HREF="pkg_android.media.html#MediaPlayer.OnVideoSizeChangedListener" class="hiddenlink" target="rightframe"><b><i>MediaPlayer.OnVideoSizeChangedListener</i></b></A><br>
+<A HREF="pkg_android.media.html#MediaRecorder.OnErrorListener" class="hiddenlink" target="rightframe"><b><i>MediaRecorder.OnErrorListener</i></b></A><br>
+<A HREF="pkg_android.media.html#MediaRecorder.OnInfoListener" class="hiddenlink" target="rightframe"><b><i>MediaRecorder.OnInfoListener</i></b></A><br>
+<A HREF="pkg_android.media.html#MediaRecorder.VideoEncoder" class="hiddenlink" target="rightframe"><b>MediaRecorder.VideoEncoder</b></A><br>
+<A HREF="pkg_android.media.html#MediaRecorder.VideoSource" class="hiddenlink" target="rightframe"><b>MediaRecorder.VideoSource</b></A><br>
+<A NAME="N"></A>
+<br><font size="+2">N</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="pkg_android.telephony.html#NeighboringCellInfo" class="hiddenlink" target="rightframe"><b>NeighboringCellInfo</b></A><br>
+<A HREF="pkg_android.text.html#NoCopySpan" class="hiddenlink" target="rightframe"><b><i>NoCopySpan</i></b></A><br>
+<A HREF="pkg_android.text.html#NoCopySpan.Concrete" class="hiddenlink" target="rightframe"><b>NoCopySpan.Concrete</b></A><br>
+<A NAME="O"></A>
+<br><font size="+2">O</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="pkg_android.view.html#OrientationEventListener" class="hiddenlink" target="rightframe"><b>OrientationEventListener</b></A><br>
+<A NAME="P"></A>
+<br><font size="+2">P</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="pkg_android.text.html#ParcelableSpan" class="hiddenlink" target="rightframe"><b><i>ParcelableSpan</i></b></A><br>
+<A HREF="pkg_android.webkit.html#PluginData" class="hiddenlink" target="rightframe"><b>PluginData</b></A><br>
+<A HREF="pkg_android.util.html#PrintStreamPrinter" class="hiddenlink" target="rightframe"><b>PrintStreamPrinter</b></A><br>
+<A HREF="pkg_android.test.html#ProviderTestCase2" class="hiddenlink" target="rightframe"><b>ProviderTestCase2</b></A><br>
+<A NAME="R"></A>
+<br><font size="+2">R</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="pkg_android.html#R.bool" class="hiddenlink" target="rightframe"><b>R.bool</b></A><br>
+<A HREF="pkg_android.html#R.integer" class="hiddenlink" target="rightframe"><b>R.integer</b></A><br>
+<A HREF="pkg_android.os.html#ResultReceiver" class="hiddenlink" target="rightframe"><b>ResultReceiver</b></A><br>
+<A NAME="S"></A>
+<br><font size="+2">S</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="pkg_android.widget.html#SectionIndexer" class="hiddenlink" target="rightframe"><b><i>SectionIndexer</i></b></A><br>
+<A HREF="pkg_android.hardware.html#Sensor" class="hiddenlink" target="rightframe"><b>Sensor</b></A><br>
+<A HREF="pkg_android.hardware.html#SensorEvent" class="hiddenlink" target="rightframe"><b>SensorEvent</b></A><br>
+<A HREF="pkg_android.hardware.html#SensorEventListener" class="hiddenlink" target="rightframe"><b><i>SensorEventListener</i></b></A><br>
+<A HREF="pkg_android.provider.html#Settings.Secure" class="hiddenlink" target="rightframe"><b>Settings.Secure</b></A><br>
+<A HREF="pkg_android.widget.html#SlidingDrawer" class="hiddenlink" target="rightframe"><b>SlidingDrawer</b></A><br>
+<A HREF="pkg_android.widget.html#SlidingDrawer.OnDrawerCloseListener" class="hiddenlink" target="rightframe"><b><i>SlidingDrawer.OnDrawerCloseListener</i></b></A><br>
+<A HREF="pkg_android.widget.html#SlidingDrawer.OnDrawerOpenListener" class="hiddenlink" target="rightframe"><b><i>SlidingDrawer.OnDrawerOpenListener</i></b></A><br>
+<A HREF="pkg_android.widget.html#SlidingDrawer.OnDrawerScrollListener" class="hiddenlink" target="rightframe"><b><i>SlidingDrawer.OnDrawerScrollListener</i></b></A><br>
+<A NAME="T"></A>
+<br><font size="+2">T</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="pkg_android.widget.html#TextView.OnEditorActionListener" class="hiddenlink" target="rightframe"><b><i>TextView.OnEditorActionListener</i></b></A><br>
+<A NAME="U"></A>
+<br><font size="+2">U</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="pkg_android.text.style.html#UpdateAppearance" class="hiddenlink" target="rightframe"><b><i>UpdateAppearance</i></b></A><br>
+<A HREF="pkg_android.provider.html#UserDictionary" class="hiddenlink" target="rightframe"><b>UserDictionary</b></A><br>
+<A HREF="pkg_android.provider.html#UserDictionary.Words" class="hiddenlink" target="rightframe"><b>UserDictionary.Words</b></A><br>
+<A NAME="V"></A>
+<br><font size="+2">V</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="pkg_android.view.html#ViewDebug.CapturedViewProperty" class="hiddenlink" target="rightframe"><b>ViewDebug.CapturedViewProperty</b></A><br>
+<A HREF="pkg_android.view.html#ViewTreeObserver.OnScrollChangedListener" class="hiddenlink" target="rightframe"><b><i>ViewTreeObserver.OnScrollChangedListener</i></b></A><br>
+<A HREF="pkg_android.opengl.html#Visibility" class="hiddenlink" target="rightframe"><b>Visibility</b></A><br>
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/classes_index_all.html b/docs/html/sdk/api_diff/3/changes/classes_index_all.html
new file mode 100644
index 000000000000..5815c29ca5a5
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/classes_index_all.html
@@ -0,0 +1,963 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+Class Differences Index
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY class="gc-documentation">
+<a NAME="topheader"></a>
+<table summary="Index for Classes" width="100%" class="jdiffIndex" border="0" cellspacing="0" cellpadding="0" style="padding-bottom:0;margin-bottom:0;">
+  <tr>
+  <th class="indexHeader">
+    Filter the Index:
+  </th>
+  </tr>
+  <tr>
+  <td class="indexText" style="line-height:1.3em;padding-left:2em;">
+<b>Classes</b>
+  <br>
+<font color="#999999">Removals</font>
+  <br>
+<A HREF="classes_index_additions.html"xclass="hiddenlink">Additions</A>
+  <br>
+<A HREF="classes_index_changes.html"xclass="hiddenlink">Changes</A>
+  </td>
+  </tr>
+</table>
+<div id="indexTableCaption">
+<font size="-2"><strong>Bold</strong>&nbsp;indicates&nbsp;New;&nbsp;<strike>Strike</strike>&nbsp;indicates&nbsp;deleted. Plain indicates changed.</font>
+</div>
+<A NAME="A"></A>
+<br><font size="+2">A</font>&nbsp;
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.widget.AbsListView.html" class="hiddenlink" target="rightframe">AbsListView</A><br>
+<A HREF="android.widget.AbsoluteLayout.html" class="hiddenlink" target="rightframe">AbsoluteLayout</A><br>
+<A HREF="android.text.style.AbsoluteSizeSpan.html" class="hiddenlink" target="rightframe">AbsoluteSizeSpan</A><br>
+<A HREF="android.widget.AbsSeekBar.html" class="hiddenlink" target="rightframe">AbsSeekBar</A><br>
+<A HREF="android.app.Activity.html" class="hiddenlink" target="rightframe">Activity</A><br>
+<A HREF="android.content.pm.ActivityInfo.html" class="hiddenlink" target="rightframe">ActivityInfo</A><br>
+<A HREF="android.test.ActivityInstrumentationTestCase.html" class="hiddenlink" target="rightframe">ActivityInstrumentationTestCase</A><br>
+<A HREF="pkg_android.test.html#ActivityInstrumentationTestCase2" class="hiddenlink" target="rightframe"><b>ActivityInstrumentationTestCase2</b></A><br>
+<A HREF="android.app.ActivityManager.html" class="hiddenlink" target="rightframe">ActivityManager</A><br>
+<A HREF="pkg_android.app.html#ActivityManager.RunningAppProcessInfo" class="hiddenlink" target="rightframe"><b>ActivityManager.RunningAppProcessInfo</b></A><br>
+<A HREF="android.app.AlarmManager.html" class="hiddenlink" target="rightframe">AlarmManager</A><br>
+<A HREF="android.app.AlertDialog.html" class="hiddenlink" target="rightframe">AlertDialog</A><br>
+<A HREF="android.text.style.AlignmentSpan.Standard.html" class="hiddenlink" target="rightframe">AlignmentSpan.Standard</A><br>
+<A HREF="pkg_android.widget.html#AlphabetIndexer" class="hiddenlink" target="rightframe"><b>AlphabetIndexer</b></A><br>
+<A HREF="android.view.animation.Animation.html" class="hiddenlink" target="rightframe">Animation</A><br>
+<A HREF="android.text.Annotation.html" class="hiddenlink" target="rightframe">Annotation</A><br>
+<A HREF="android.widget.ArrayAdapter.html" class="hiddenlink" target="rightframe">ArrayAdapter</A><br>
+<A HREF="android.text.method.ArrowKeyMovementMethod.html" class="hiddenlink" target="rightframe">ArrowKeyMovementMethod</A><br>
+<A HREF="android.content.res.AssetFileDescriptor.html" class="hiddenlink" target="rightframe">AssetFileDescriptor</A><br>
+<A HREF="pkg_android.content.res.html#AssetFileDescriptor.AutoCloseInputStream" class="hiddenlink" target="rightframe"><b>AssetFileDescriptor.AutoCloseInputStream</b></A><br>
+<A HREF="pkg_android.content.res.html#AssetFileDescriptor.AutoCloseOutputStream" class="hiddenlink" target="rightframe"><b>AssetFileDescriptor.AutoCloseOutputStream</b></A><br>
+<A HREF="pkg_android.os.html#AsyncTask" class="hiddenlink" target="rightframe"><b>AsyncTask</b></A><br>
+<A HREF="pkg_android.os.html#AsyncTask.Status" class="hiddenlink" target="rightframe"><b>AsyncTask.Status</b></A><br>
+<A HREF="pkg_android.media.html#AudioFormat" class="hiddenlink" target="rightframe"><b>AudioFormat</b></A><br>
+<A HREF="android.media.AudioManager.html" class="hiddenlink" target="rightframe">AudioManager</A><br>
+<A HREF="pkg_android.media.html#AudioRecord" class="hiddenlink" target="rightframe"><b>AudioRecord</b></A><br>
+<A HREF="pkg_android.media.html#AudioRecord.OnRecordPositionUpdateListener" class="hiddenlink" target="rightframe"><b><i>AudioRecord.OnRecordPositionUpdateListener</i></b></A><br>
+<A HREF="pkg_android.media.html#AudioTrack" class="hiddenlink" target="rightframe"><b>AudioTrack</b></A><br>
+<A HREF="pkg_android.media.html#AudioTrack.OnPlaybackPositionUpdateListener" class="hiddenlink" target="rightframe"><b><i>AudioTrack.OnPlaybackPositionUpdateListener</i></b></A><br>
+<A HREF="android.widget.AutoCompleteTextView.html" class="hiddenlink" target="rightframe">AutoCompleteTextView</A><br>
+<A HREF="android.text.AutoText.html" class="hiddenlink" target="rightframe">AutoText</A><br>
+<A NAME="B"></A>
+<br><font size="+2">B</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.text.style.BackgroundColorSpan.html" class="hiddenlink" target="rightframe">BackgroundColorSpan</A><br>
+<A HREF="android.text.method.BaseKeyListener.html" class="hiddenlink" target="rightframe">BaseKeyListener</A><br>
+<A HREF="android.os.Binder.html" class="hiddenlink" target="rightframe">Binder</A><br>
+<A HREF="android.graphics.Bitmap.html" class="hiddenlink" target="rightframe">Bitmap</A><br>
+<A HREF="android.content.BroadcastReceiver.html" class="hiddenlink" target="rightframe">BroadcastReceiver</A><br>
+<A HREF="android.provider.Browser.html" class="hiddenlink" target="rightframe">Browser</A><br>
+<A HREF="android.os.Build.html" class="hiddenlink" target="rightframe">Build</A><br>
+<A HREF="android.text.style.BulletSpan.html" class="hiddenlink" target="rightframe">BulletSpan</A><br>
+<A NAME="C"></A>
+<br><font size="+2">C</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.hardware.Camera.html" class="hiddenlink" target="rightframe">Camera</A><br>
+<A HREF="android.graphics.Canvas.html" class="hiddenlink" target="rightframe">Canvas</A><br>
+<A HREF="java.lang.Character.UnicodeBlock.html" class="hiddenlink" target="rightframe">Character.UnicodeBlock</A><br>
+<A HREF="android.widget.Chronometer.html" class="hiddenlink" target="rightframe">Chronometer</A><br>
+<A HREF="pkg_android.widget.html#Chronometer.OnChronometerTickListener" class="hiddenlink" target="rightframe"><b><i>Chronometer.OnChronometerTickListener</i></b></A><br>
+<A HREF="java.lang.Class.html" class="hiddenlink" target="rightframe">Class</A><br>
+<A HREF="android.text.style.ClickableSpan.html" class="hiddenlink" target="rightframe">ClickableSpan</A><br>
+<A HREF="android.content.res.Configuration.html" class="hiddenlink" target="rightframe">Configuration</A><br>
+<A HREF="pkg_android.content.pm.html#ConfigurationInfo" class="hiddenlink" target="rightframe"><b>ConfigurationInfo</b></A><br>
+<A HREF="android.net.ConnectivityManager.html" class="hiddenlink" target="rightframe">ConnectivityManager</A><br>
+<A HREF="android.provider.Contacts.Intents.html" class="hiddenlink" target="rightframe">Contacts.Intents</A><br>
+<A HREF="android.provider.Contacts.Intents.Insert.html" class="hiddenlink" target="rightframe">Contacts.Intents.Insert</A><br>
+<A HREF="android.provider.Contacts.PeopleColumns.html" class="hiddenlink" target="rightframe"><i>Contacts.PeopleColumns</i></A><br>
+<A HREF="android.content.ContentProvider.html" class="hiddenlink" target="rightframe">ContentProvider</A><br>
+<A HREF="android.content.ContentResolver.html" class="hiddenlink" target="rightframe">ContentResolver</A><br>
+<A HREF="android.content.Context.html" class="hiddenlink" target="rightframe">Context</A><br>
+<A HREF="android.database.Cursor.html" class="hiddenlink" target="rightframe"><i>Cursor</i></A><br>
+<A HREF="android.widget.CursorAdapter.html" class="hiddenlink" target="rightframe">CursorAdapter</A><br>
+<A HREF="android.database.CursorWrapper.html" class="hiddenlink" target="rightframe">CursorWrapper</A><br>
+<A NAME="D"></A>
+<br><font size="+2">D</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.database.DatabaseUtils.html" class="hiddenlink" target="rightframe">DatabaseUtils</A><br>
+<A HREF="java.util.Date.html" class="hiddenlink" target="rightframe">Date</A><br>
+<A HREF="android.text.method.DateKeyListener.html" class="hiddenlink" target="rightframe">DateKeyListener</A><br>
+<A HREF="android.text.method.DateTimeKeyListener.html" class="hiddenlink" target="rightframe">DateTimeKeyListener</A><br>
+<A HREF="android.os.Debug.html" class="hiddenlink" target="rightframe">Debug</A><br>
+<A HREF="pkg_dalvik.system.html#DexClassLoader" class="hiddenlink" target="rightframe"><b>DexClassLoader</b></A><br>
+<A HREF="dalvik.system.DexFile.html" class="hiddenlink" target="rightframe">DexFile</A><br>
+<A HREF="android.text.method.DialerKeyListener.html" class="hiddenlink" target="rightframe">DialerKeyListener</A><br>
+<A HREF="android.content.DialogInterface.html" class="hiddenlink" target="rightframe"><i>DialogInterface</i></A><br>
+<A HREF="android.preference.DialogPreference.html" class="hiddenlink" target="rightframe">DialogPreference</A><br>
+<A HREF="android.text.method.DigitsKeyListener.html" class="hiddenlink" target="rightframe">DigitsKeyListener</A><br>
+<A HREF="android.graphics.drawable.Drawable.html" class="hiddenlink" target="rightframe">Drawable</A><br>
+<A HREF="android.text.style.DynamicDrawableSpan.html" class="hiddenlink" target="rightframe">DynamicDrawableSpan</A><br>
+<A NAME="E"></A>
+<br><font size="+2">E</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.os.Environment.html" class="hiddenlink" target="rightframe">Environment</A><br>
+<A NAME="F"></A>
+<br><font size="+2">F</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.text.style.ForegroundColorSpan.html" class="hiddenlink" target="rightframe">ForegroundColorSpan</A><br>
+<A NAME="G"></A>
+<br><font size="+2">G</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="pkg_android.hardware.html#GeomagneticField" class="hiddenlink" target="rightframe"><b>GeomagneticField</b></A><br>
+<A HREF="android.view.GestureDetector.html" class="hiddenlink" target="rightframe">GestureDetector</A><br>
+<A HREF="pkg_android.view.html#GestureDetector.OnDoubleTapListener" class="hiddenlink" target="rightframe"><b><i>GestureDetector.OnDoubleTapListener</i></b></A><br>
+<A HREF="android.view.GestureDetector.SimpleOnGestureListener.html" class="hiddenlink" target="rightframe">GestureDetector.SimpleOnGestureListener</A><br>
+<A HREF="pkg_android.opengl.html#GLSurfaceView" class="hiddenlink" target="rightframe"><b>GLSurfaceView</b></A><br>
+<A HREF="pkg_android.opengl.html#GLSurfaceView.EGLConfigChooser" class="hiddenlink" target="rightframe"><b><i>GLSurfaceView.EGLConfigChooser</i></b></A><br>
+<A HREF="pkg_android.opengl.html#GLSurfaceView.GLWrapper" class="hiddenlink" target="rightframe"><b><i>GLSurfaceView.GLWrapper</i></b></A><br>
+<A HREF="pkg_android.opengl.html#GLSurfaceView.Renderer" class="hiddenlink" target="rightframe"><b><i>GLSurfaceView.Renderer</i></b></A><br>
+<A HREF="pkg_android.location.html#GpsSatellite" class="hiddenlink" target="rightframe"><b>GpsSatellite</b></A><br>
+<A HREF="pkg_android.location.html#GpsStatus" class="hiddenlink" target="rightframe"><b>GpsStatus</b></A><br>
+<A HREF="pkg_android.location.html#GpsStatus.Listener" class="hiddenlink" target="rightframe"><b><i>GpsStatus.Listener</i></b></A><br>
+<A HREF="android.view.Gravity.html" class="hiddenlink" target="rightframe">Gravity</A><br>
+<A HREF="android.widget.GridView.html" class="hiddenlink" target="rightframe">GridView</A><br>
+<A NAME="H"></A>
+<br><font size="+2">H</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.os.Handler.html" class="hiddenlink" target="rightframe">Handler</A><br>
+<A HREF="pkg_android.os.html#Handler.Callback" class="hiddenlink" target="rightframe"><b><i>Handler.Callback</i></b></A><br>
+<A HREF="pkg_android.view.html#HapticFeedbackConstants" class="hiddenlink" target="rightframe"><b>HapticFeedbackConstants</b></A><br>
+<A HREF="pkg_android.widget.html#HorizontalScrollView" class="hiddenlink" target="rightframe"><b>HorizontalScrollView</b></A><br>
+<A NAME="I"></A>
+<br><font size="+2">I</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.os.IBinder.html" class="hiddenlink" target="rightframe"><i>IBinder</i></A><br>
+<A HREF="android.text.style.ImageSpan.html" class="hiddenlink" target="rightframe">ImageSpan</A><br>
+<A HREF="pkg_android.text.html#InputType" class="hiddenlink" target="rightframe"><b><i>InputType</i></b></A><br>
+<A HREF="android.app.Instrumentation.html" class="hiddenlink" target="rightframe">Instrumentation</A><br>
+<A HREF="android.test.InstrumentationTestCase.html" class="hiddenlink" target="rightframe">InstrumentationTestCase</A><br>
+<A HREF="android.content.Intent.html" class="hiddenlink" target="rightframe">Intent</A><br>
+<A HREF="pkg_android.app.html#IntentService" class="hiddenlink" target="rightframe"><b>IntentService</b></A><br>
+<A NAME="J"></A>
+<br><font size="+2">J</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="pkg_android.media.html#JetPlayer" class="hiddenlink" target="rightframe"><b>JetPlayer</b></A><br>
+<A HREF="pkg_android.media.html#JetPlayer.OnJetEventListener" class="hiddenlink" target="rightframe"><b><i>JetPlayer.OnJetEventListener</i></b></A><br>
+<A NAME="K"></A>
+<br><font size="+2">K</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.view.KeyCharacterMap.html" class="hiddenlink" target="rightframe">KeyCharacterMap</A><br>
+<A HREF="android.view.KeyEvent.html" class="hiddenlink" target="rightframe">KeyEvent</A><br>
+<A HREF="android.text.method.KeyListener.html" class="hiddenlink" target="rightframe"><i>KeyListener</i></A><br>
+<A NAME="L"></A>
+<br><font size="+2">L</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.app.LauncherActivity.html" class="hiddenlink" target="rightframe">LauncherActivity</A><br>
+<A HREF="pkg_android.app.html#LauncherActivity.IconResizer" class="hiddenlink" target="rightframe"><b>LauncherActivity.IconResizer</b></A><br>
+<A HREF="pkg_android.app.html#LauncherActivity.ListItem" class="hiddenlink" target="rightframe"><b>LauncherActivity.ListItem</b></A><br>
+<A HREF="android.text.style.LeadingMarginSpan.Standard.html" class="hiddenlink" target="rightframe">LeadingMarginSpan.Standard</A><br>
+<A HREF="java.util.logging.Level.html" class="hiddenlink" target="rightframe">Level</A><br>
+<A HREF="android.widget.ListView.html" class="hiddenlink" target="rightframe">ListView</A><br>
+<A HREF="pkg_android.provider.html#LiveFolders" class="hiddenlink" target="rightframe"><b>LiveFolders</b></A><br>
+<A HREF="android.location.Location.html" class="hiddenlink" target="rightframe">Location</A><br>
+<A HREF="android.location.LocationManager.html" class="hiddenlink" target="rightframe">LocationManager</A><br>
+<A HREF="java.util.logging.LogManager.html" class="hiddenlink" target="rightframe">LogManager</A><br>
+<A HREF="android.os.Looper.html" class="hiddenlink" target="rightframe">Looper</A><br>
+<A NAME="M"></A>
+<br><font size="+2">M</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.Manifest.permission.html" class="hiddenlink" target="rightframe">Manifest.permission</A><br>
+<A HREF="android.text.style.MaskFilterSpan.html" class="hiddenlink" target="rightframe">MaskFilterSpan</A><br>
+<A HREF="android.media.MediaPlayer.html" class="hiddenlink" target="rightframe">MediaPlayer</A><br>
+<A HREF="pkg_android.media.html#MediaPlayer.OnInfoListener" class="hiddenlink" target="rightframe"><b><i>MediaPlayer.OnInfoListener</i></b></A><br>
+<A HREF="pkg_android.media.html#MediaPlayer.OnVideoSizeChangedListener" class="hiddenlink" target="rightframe"><b><i>MediaPlayer.OnVideoSizeChangedListener</i></b></A><br>
+<A HREF="android.media.MediaRecorder.html" class="hiddenlink" target="rightframe">MediaRecorder</A><br>
+<A HREF="pkg_android.media.html#MediaRecorder.OnErrorListener" class="hiddenlink" target="rightframe"><b><i>MediaRecorder.OnErrorListener</i></b></A><br>
+<A HREF="pkg_android.media.html#MediaRecorder.OnInfoListener" class="hiddenlink" target="rightframe"><b><i>MediaRecorder.OnInfoListener</i></b></A><br>
+<A HREF="android.media.MediaRecorder.OutputFormat.html" class="hiddenlink" target="rightframe">MediaRecorder.OutputFormat</A><br>
+<A HREF="pkg_android.media.html#MediaRecorder.VideoEncoder" class="hiddenlink" target="rightframe"><b>MediaRecorder.VideoEncoder</b></A><br>
+<A HREF="pkg_android.media.html#MediaRecorder.VideoSource" class="hiddenlink" target="rightframe"><b>MediaRecorder.VideoSource</b></A><br>
+<A HREF="android.provider.MediaStore.html" class="hiddenlink" target="rightframe">MediaStore</A><br>
+<A HREF="android.provider.MediaStore.Audio.AlbumColumns.html" class="hiddenlink" target="rightframe"><i>MediaStore.Audio.AlbumColumns</i></A><br>
+<A HREF="android.provider.MediaStore.Audio.Media.html" class="hiddenlink" target="rightframe">MediaStore.Audio.Media</A><br>
+<A HREF="android.provider.MediaStore.Images.Media.html" class="hiddenlink" target="rightframe">MediaStore.Images.Media</A><br>
+<A HREF="android.provider.MediaStore.Video.html" class="hiddenlink" target="rightframe">MediaStore.Video</A><br>
+<A HREF="android.provider.MediaStore.Video.VideoColumns.html" class="hiddenlink" target="rightframe"><i>MediaStore.Video.VideoColumns</i></A><br>
+<A HREF="android.view.Menu.html" class="hiddenlink" target="rightframe"><i>Menu</i></A><br>
+<A HREF="android.text.method.MetaKeyKeyListener.html" class="hiddenlink" target="rightframe">MetaKeyKeyListener</A><br>
+<A HREF="android.test.mock.MockPackageManager.html" class="hiddenlink" target="rightframe">MockPackageManager</A><br>
+<A HREF="android.view.MotionEvent.html" class="hiddenlink" target="rightframe">MotionEvent</A><br>
+<A HREF="android.text.method.MovementMethod.html" class="hiddenlink" target="rightframe"><i>MovementMethod</i></A><br>
+<A HREF="android.text.method.MultiTapKeyListener.html" class="hiddenlink" target="rightframe">MultiTapKeyListener</A><br>
+<A NAME="N"></A>
+<br><font size="+2">N</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="pkg_android.telephony.html#NeighboringCellInfo" class="hiddenlink" target="rightframe"><b>NeighboringCellInfo</b></A><br>
+<A HREF="android.net.NetworkInfo.html" class="hiddenlink" target="rightframe">NetworkInfo</A><br>
+<A HREF="pkg_android.text.html#NoCopySpan" class="hiddenlink" target="rightframe"><b><i>NoCopySpan</i></b></A><br>
+<A HREF="pkg_android.text.html#NoCopySpan.Concrete" class="hiddenlink" target="rightframe"><b>NoCopySpan.Concrete</b></A><br>
+<A NAME="O"></A>
+<br><font size="+2">O</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="pkg_android.view.html#OrientationEventListener" class="hiddenlink" target="rightframe"><b>OrientationEventListener</b></A><br>
+<A HREF="android.view.OrientationListener.html" class="hiddenlink" target="rightframe">OrientationListener</A><br>
+<A NAME="P"></A>
+<br><font size="+2">P</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="java.util.jar.Pack200.Packer.html" class="hiddenlink" target="rightframe"><i>Pack200.Packer</i></A><br>
+<A HREF="java.util.jar.Pack200.Unpacker.html" class="hiddenlink" target="rightframe"><i>Pack200.Unpacker</i></A><br>
+<A HREF="android.content.pm.PackageInfo.html" class="hiddenlink" target="rightframe">PackageInfo</A><br>
+<A HREF="android.content.pm.PackageManager.html" class="hiddenlink" target="rightframe">PackageManager</A><br>
+<A HREF="android.os.Parcel.html" class="hiddenlink" target="rightframe">Parcel</A><br>
+<A HREF="pkg_android.text.html#ParcelableSpan" class="hiddenlink" target="rightframe"><b><i>ParcelableSpan</i></b></A><br>
+<A HREF="android.os.ParcelFileDescriptor.html" class="hiddenlink" target="rightframe">ParcelFileDescriptor</A><br>
+<A HREF="android.app.PendingIntent.html" class="hiddenlink" target="rightframe">PendingIntent</A><br>
+<A HREF="android.telephony.PhoneNumberUtils.html" class="hiddenlink" target="rightframe">PhoneNumberUtils</A><br>
+<A HREF="pkg_android.webkit.html#PluginData" class="hiddenlink" target="rightframe"><b>PluginData</b></A><br>
+<A HREF="android.widget.PopupWindow.html" class="hiddenlink" target="rightframe">PopupWindow</A><br>
+<A HREF="android.widget.PopupWindow.OnDismissListener.html" class="hiddenlink" target="rightframe"><i>PopupWindow.OnDismissListener</i></A><br>
+<A HREF="pkg_android.util.html#PrintStreamPrinter" class="hiddenlink" target="rightframe"><b>PrintStreamPrinter</b></A><br>
+<A HREF="android.widget.ProgressBar.html" class="hiddenlink" target="rightframe">ProgressBar</A><br>
+<A HREF="android.test.ProviderTestCase.html" class="hiddenlink" target="rightframe">ProviderTestCase</A><br>
+<A HREF="pkg_android.test.html#ProviderTestCase2" class="hiddenlink" target="rightframe"><b>ProviderTestCase2</b></A><br>
+<A HREF="java.lang.reflect.Proxy.html" class="hiddenlink" target="rightframe">Proxy</A><br>
+<A NAME="Q"></A>
+<br><font size="+2">Q</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.text.style.QuoteSpan.html" class="hiddenlink" target="rightframe">QuoteSpan</A><br>
+<A HREF="android.text.method.QwertyKeyListener.html" class="hiddenlink" target="rightframe">QwertyKeyListener</A><br>
+<A NAME="R"></A>
+<br><font size="+2">R</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.R.attr.html" class="hiddenlink" target="rightframe">R.attr</A><br>
+<A HREF="pkg_android.html#R.bool" class="hiddenlink" target="rightframe"><b>R.bool</b></A><br>
+<A HREF="android.R.drawable.html" class="hiddenlink" target="rightframe">R.drawable</A><br>
+<A HREF="android.R.id.html" class="hiddenlink" target="rightframe">R.id</A><br>
+<A HREF="pkg_android.html#R.integer" class="hiddenlink" target="rightframe"><b>R.integer</b></A><br>
+<A HREF="android.R.string.html" class="hiddenlink" target="rightframe">R.string</A><br>
+<A HREF="android.R.style.html" class="hiddenlink" target="rightframe">R.style</A><br>
+<A HREF="android.text.style.RasterizerSpan.html" class="hiddenlink" target="rightframe">RasterizerSpan</A><br>
+<A HREF="android.graphics.Rect.html" class="hiddenlink" target="rightframe">Rect</A><br>
+<A HREF="android.graphics.RectF.html" class="hiddenlink" target="rightframe">RectF</A><br>
+<A HREF="android.text.style.RelativeSizeSpan.html" class="hiddenlink" target="rightframe">RelativeSizeSpan</A><br>
+<A HREF="android.widget.RemoteViews.html" class="hiddenlink" target="rightframe">RemoteViews</A><br>
+<A HREF="android.widget.RemoteViews.ActionException.html" class="hiddenlink" target="rightframe">RemoteViews.ActionException</A><br>
+<A HREF="android.widget.ResourceCursorAdapter.html" class="hiddenlink" target="rightframe">ResourceCursorAdapter</A><br>
+<A HREF="android.content.res.Resources.html" class="hiddenlink" target="rightframe">Resources</A><br>
+<A HREF="pkg_android.os.html#ResultReceiver" class="hiddenlink" target="rightframe"><b>ResultReceiver</b></A><br>
+<A HREF="android.media.RingtoneManager.html" class="hiddenlink" target="rightframe">RingtoneManager</A><br>
+<A HREF="android.graphics.drawable.RotateDrawable.html" class="hiddenlink" target="rightframe">RotateDrawable</A><br>
+<A NAME="S"></A>
+<br><font size="+2">S</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.graphics.drawable.ScaleDrawable.html" class="hiddenlink" target="rightframe">ScaleDrawable</A><br>
+<A HREF="android.text.style.ScaleXSpan.html" class="hiddenlink" target="rightframe">ScaleXSpan</A><br>
+<A HREF="android.widget.Scroller.html" class="hiddenlink" target="rightframe">Scroller</A><br>
+<A HREF="android.text.method.ScrollingMovementMethod.html" class="hiddenlink" target="rightframe">ScrollingMovementMethod</A><br>
+<A HREF="pkg_android.widget.html#SectionIndexer" class="hiddenlink" target="rightframe"><b><i>SectionIndexer</i></b></A><br>
+<A HREF="pkg_android.hardware.html#Sensor" class="hiddenlink" target="rightframe"><b>Sensor</b></A><br>
+<A HREF="pkg_android.hardware.html#SensorEvent" class="hiddenlink" target="rightframe"><b>SensorEvent</b></A><br>
+<A HREF="pkg_android.hardware.html#SensorEventListener" class="hiddenlink" target="rightframe"><b><i>SensorEventListener</i></b></A><br>
+<A HREF="android.hardware.SensorListener.html" class="hiddenlink" target="rightframe"><i>SensorListener</i></A><br>
+<A HREF="android.hardware.SensorManager.html" class="hiddenlink" target="rightframe">SensorManager</A><br>
+<A HREF="android.provider.Settings.html" class="hiddenlink" target="rightframe">Settings</A><br>
+<A HREF="pkg_android.provider.html#Settings.Secure" class="hiddenlink" target="rightframe"><b>Settings.Secure</b></A><br>
+<A HREF="android.provider.Settings.System.html" class="hiddenlink" target="rightframe">Settings.System</A><br>
+<A HREF="android.graphics.drawable.shapes.Shape.html" class="hiddenlink" target="rightframe">Shape</A><br>
+<A HREF="android.widget.SimpleCursorAdapter.html" class="hiddenlink" target="rightframe">SimpleCursorAdapter</A><br>
+<A HREF="pkg_android.widget.html#SlidingDrawer" class="hiddenlink" target="rightframe"><b>SlidingDrawer</b></A><br>
+<A HREF="pkg_android.widget.html#SlidingDrawer.OnDrawerCloseListener" class="hiddenlink" target="rightframe"><b><i>SlidingDrawer.OnDrawerCloseListener</i></b></A><br>
+<A HREF="pkg_android.widget.html#SlidingDrawer.OnDrawerOpenListener" class="hiddenlink" target="rightframe"><b><i>SlidingDrawer.OnDrawerOpenListener</i></b></A><br>
+<A HREF="pkg_android.widget.html#SlidingDrawer.OnDrawerScrollListener" class="hiddenlink" target="rightframe"><b><i>SlidingDrawer.OnDrawerScrollListener</i></b></A><br>
+<A HREF="android.telephony.gsm.SmsMessage.html" class="hiddenlink" target="rightframe">SmsMessage</A><br>
+<A HREF="java.net.Socket.html" class="hiddenlink" target="rightframe">Socket</A><br>
+<A HREF="android.media.SoundPool.html" class="hiddenlink" target="rightframe">SoundPool</A><br>
+<A HREF="android.text.Spanned.html" class="hiddenlink" target="rightframe"><i>Spanned</i></A><br>
+<A HREF="android.text.SpanWatcher.html" class="hiddenlink" target="rightframe"><i>SpanWatcher</i></A><br>
+<A HREF="android.util.SparseIntArray.html" class="hiddenlink" target="rightframe">SparseIntArray</A><br>
+<A HREF="android.database.sqlite.SQLiteDatabase.html" class="hiddenlink" target="rightframe">SQLiteDatabase</A><br>
+<A HREF="android.text.style.StrikethroughSpan.html" class="hiddenlink" target="rightframe">StrikethroughSpan</A><br>
+<A HREF="java.lang.String.html" class="hiddenlink" target="rightframe">String</A><br>
+<A HREF="android.text.style.StyleSpan.html" class="hiddenlink" target="rightframe">StyleSpan</A><br>
+<A HREF="android.text.style.SubscriptSpan.html" class="hiddenlink" target="rightframe">SubscriptSpan</A><br>
+<A HREF="android.text.style.SuperscriptSpan.html" class="hiddenlink" target="rightframe">SuperscriptSpan</A><br>
+<A NAME="T"></A>
+<br><font size="+2">T</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.telephony.TelephonyManager.html" class="hiddenlink" target="rightframe">TelephonyManager</A><br>
+<A HREF="android.test.suitebuilder.TestMethod.html" class="hiddenlink" target="rightframe">TestMethod</A><br>
+<A HREF="android.test.suitebuilder.TestSuiteBuilder.html" class="hiddenlink" target="rightframe">TestSuiteBuilder</A><br>
+<A HREF="android.text.style.TextAppearanceSpan.html" class="hiddenlink" target="rightframe">TextAppearanceSpan</A><br>
+<A HREF="android.text.method.TextKeyListener.html" class="hiddenlink" target="rightframe">TextKeyListener</A><br>
+<A HREF="android.text.TextUtils.html" class="hiddenlink" target="rightframe">TextUtils</A><br>
+<A HREF="android.widget.TextView.html" class="hiddenlink" target="rightframe">TextView</A><br>
+<A HREF="pkg_android.widget.html#TextView.OnEditorActionListener" class="hiddenlink" target="rightframe"><b><i>TextView.OnEditorActionListener</i></b></A><br>
+<A HREF="android.text.TextWatcher.html" class="hiddenlink" target="rightframe"><i>TextWatcher</i></A><br>
+<A HREF="android.text.method.TimeKeyListener.html" class="hiddenlink" target="rightframe">TimeKeyListener</A><br>
+<A HREF="android.util.TimeUtils.html" class="hiddenlink" target="rightframe">TimeUtils</A><br>
+<A HREF="android.text.method.Touch.html" class="hiddenlink" target="rightframe">Touch</A><br>
+<A HREF="android.test.TouchUtils.html" class="hiddenlink" target="rightframe">TouchUtils</A><br>
+<A HREF="android.view.animation.Transformation.html" class="hiddenlink" target="rightframe">Transformation</A><br>
+<A HREF="android.graphics.drawable.TransitionDrawable.html" class="hiddenlink" target="rightframe">TransitionDrawable</A><br>
+<A HREF="android.content.res.TypedArray.html" class="hiddenlink" target="rightframe">TypedArray</A><br>
+<A HREF="android.text.style.TypefaceSpan.html" class="hiddenlink" target="rightframe">TypefaceSpan</A><br>
+<A NAME="U"></A>
+<br><font size="+2">U</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.text.style.UnderlineSpan.html" class="hiddenlink" target="rightframe">UnderlineSpan</A><br>
+<A HREF="pkg_android.text.style.html#UpdateAppearance" class="hiddenlink" target="rightframe"><b><i>UpdateAppearance</i></b></A><br>
+<A HREF="android.text.style.UpdateLayout.html" class="hiddenlink" target="rightframe"><i>UpdateLayout</i></A><br>
+<A HREF="android.webkit.UrlInterceptHandler.html" class="hiddenlink" target="rightframe"><i>UrlInterceptHandler</i></A><br>
+<A HREF="android.webkit.UrlInterceptRegistry.html" class="hiddenlink" target="rightframe">UrlInterceptRegistry</A><br>
+<A HREF="android.text.style.URLSpan.html" class="hiddenlink" target="rightframe">URLSpan</A><br>
+<A HREF="android.webkit.URLUtil.html" class="hiddenlink" target="rightframe">URLUtil</A><br>
+<A HREF="pkg_android.provider.html#UserDictionary" class="hiddenlink" target="rightframe"><b>UserDictionary</b></A><br>
+<A HREF="pkg_android.provider.html#UserDictionary.Words" class="hiddenlink" target="rightframe"><b>UserDictionary.Words</b></A><br>
+<A NAME="V"></A>
+<br><font size="+2">V</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.view.View.html" class="hiddenlink" target="rightframe">View</A><br>
+<A HREF="android.view.ViewConfiguration.html" class="hiddenlink" target="rightframe">ViewConfiguration</A><br>
+<A HREF="android.view.ViewDebug.html" class="hiddenlink" target="rightframe">ViewDebug</A><br>
+<A HREF="pkg_android.view.html#ViewDebug.CapturedViewProperty" class="hiddenlink" target="rightframe"><b>ViewDebug.CapturedViewProperty</b></A><br>
+<A HREF="android.view.ViewGroup.html" class="hiddenlink" target="rightframe">ViewGroup</A><br>
+<A HREF="android.view.ViewParent.html" class="hiddenlink" target="rightframe"><i>ViewParent</i></A><br>
+<A HREF="android.view.ViewTreeObserver.html" class="hiddenlink" target="rightframe">ViewTreeObserver</A><br>
+<A HREF="pkg_android.view.html#ViewTreeObserver.OnScrollChangedListener" class="hiddenlink" target="rightframe"><b><i>ViewTreeObserver.OnScrollChangedListener</i></b></A><br>
+<A HREF="pkg_android.opengl.html#Visibility" class="hiddenlink" target="rightframe"><b>Visibility</b></A><br>
+<A HREF="dalvik.system.VMDebug.html" class="hiddenlink" target="rightframe">VMDebug</A><br>
+<A NAME="W"></A>
+<br><font size="+2">W</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.webkit.WebHistoryItem.html" class="hiddenlink" target="rightframe">WebHistoryItem</A><br>
+<A HREF="android.webkit.WebSettings.html" class="hiddenlink" target="rightframe">WebSettings</A><br>
+<A HREF="android.webkit.WebView.html" class="hiddenlink" target="rightframe">WebView</A><br>
+<A HREF="android.net.wifi.WifiManager.html" class="hiddenlink" target="rightframe">WifiManager</A><br>
+<A HREF="android.view.Window.html" class="hiddenlink" target="rightframe">Window</A><br>
+<A HREF="android.view.WindowManager.LayoutParams.html" class="hiddenlink" target="rightframe">WindowManager.LayoutParams</A><br>
+<A NAME="Z"></A>
+<br><font size="+2">Z</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="dalvik.system.Zygote.html" class="hiddenlink" target="rightframe">Zygote</A><br>
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/classes_index_changes.html b/docs/html/sdk/api_diff/3/changes/classes_index_changes.html
new file mode 100644
index 000000000000..58d4edcbc8a7
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/classes_index_changes.html
@@ -0,0 +1,846 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+Class Changes Index
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY class="gc-documentation">
+<a NAME="topheader"></a>
+<table summary="Index for Classes" width="100%" class="jdiffIndex" border="0" cellspacing="0" cellpadding="0" style="padding-bottom:0;margin-bottom:0;">
+  <tr>
+  <th class="indexHeader">
+    Filter the Index:
+  </th>
+  </tr>
+  <tr>
+  <td class="indexText" style="line-height:1.3em;padding-left:2em;">
+<a href="classes_index_all.html" class="staysblack">All Classes</a>
+  <br>
+<font color="#999999">Removals</font>
+  <br>
+<A HREF="classes_index_additions.html"xclass="hiddenlink">Additions</A>
+  <br>
+<b>Changes</b>
+  </td>
+  </tr>
+</table>
+<div id="indexTableCaption">
+<font size="-2"><strong>Bold</strong>&nbsp;indicates&nbsp;New;&nbsp;<strike>Strike</strike>&nbsp;indicates&nbsp;deleted. Plain indicates changed.</font>
+</div>
+<A NAME="A"></A>
+<br><font size="+2">A</font>&nbsp;
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.widget.AbsListView.html" class="hiddenlink" target="rightframe">AbsListView</A><br>
+<A HREF="android.widget.AbsoluteLayout.html" class="hiddenlink" target="rightframe">AbsoluteLayout</A><br>
+<A HREF="android.text.style.AbsoluteSizeSpan.html" class="hiddenlink" target="rightframe">AbsoluteSizeSpan</A><br>
+<A HREF="android.widget.AbsSeekBar.html" class="hiddenlink" target="rightframe">AbsSeekBar</A><br>
+<A HREF="android.app.Activity.html" class="hiddenlink" target="rightframe">Activity</A><br>
+<A HREF="android.content.pm.ActivityInfo.html" class="hiddenlink" target="rightframe">ActivityInfo</A><br>
+<A HREF="android.test.ActivityInstrumentationTestCase.html" class="hiddenlink" target="rightframe">ActivityInstrumentationTestCase</A><br>
+<A HREF="android.app.ActivityManager.html" class="hiddenlink" target="rightframe">ActivityManager</A><br>
+<A HREF="android.app.AlarmManager.html" class="hiddenlink" target="rightframe">AlarmManager</A><br>
+<A HREF="android.app.AlertDialog.html" class="hiddenlink" target="rightframe">AlertDialog</A><br>
+<A HREF="android.text.style.AlignmentSpan.Standard.html" class="hiddenlink" target="rightframe">AlignmentSpan.Standard</A><br>
+<A HREF="android.view.animation.Animation.html" class="hiddenlink" target="rightframe">Animation</A><br>
+<A HREF="android.text.Annotation.html" class="hiddenlink" target="rightframe">Annotation</A><br>
+<A HREF="android.widget.ArrayAdapter.html" class="hiddenlink" target="rightframe">ArrayAdapter</A><br>
+<A HREF="android.text.method.ArrowKeyMovementMethod.html" class="hiddenlink" target="rightframe">ArrowKeyMovementMethod</A><br>
+<A HREF="android.content.res.AssetFileDescriptor.html" class="hiddenlink" target="rightframe">AssetFileDescriptor</A><br>
+<A HREF="android.media.AudioManager.html" class="hiddenlink" target="rightframe">AudioManager</A><br>
+<A HREF="android.widget.AutoCompleteTextView.html" class="hiddenlink" target="rightframe">AutoCompleteTextView</A><br>
+<A HREF="android.text.AutoText.html" class="hiddenlink" target="rightframe">AutoText</A><br>
+<A NAME="B"></A>
+<br><font size="+2">B</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.text.style.BackgroundColorSpan.html" class="hiddenlink" target="rightframe">BackgroundColorSpan</A><br>
+<A HREF="android.text.method.BaseKeyListener.html" class="hiddenlink" target="rightframe">BaseKeyListener</A><br>
+<A HREF="android.os.Binder.html" class="hiddenlink" target="rightframe">Binder</A><br>
+<A HREF="android.graphics.Bitmap.html" class="hiddenlink" target="rightframe">Bitmap</A><br>
+<A HREF="android.content.BroadcastReceiver.html" class="hiddenlink" target="rightframe">BroadcastReceiver</A><br>
+<A HREF="android.provider.Browser.html" class="hiddenlink" target="rightframe">Browser</A><br>
+<A HREF="android.os.Build.html" class="hiddenlink" target="rightframe">Build</A><br>
+<A HREF="android.text.style.BulletSpan.html" class="hiddenlink" target="rightframe">BulletSpan</A><br>
+<A NAME="C"></A>
+<br><font size="+2">C</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.hardware.Camera.html" class="hiddenlink" target="rightframe">Camera</A><br>
+<A HREF="android.graphics.Canvas.html" class="hiddenlink" target="rightframe">Canvas</A><br>
+<A HREF="java.lang.Character.UnicodeBlock.html" class="hiddenlink" target="rightframe">Character.UnicodeBlock</A><br>
+<A HREF="android.widget.Chronometer.html" class="hiddenlink" target="rightframe">Chronometer</A><br>
+<A HREF="java.lang.Class.html" class="hiddenlink" target="rightframe">Class</A><br>
+<A HREF="android.text.style.ClickableSpan.html" class="hiddenlink" target="rightframe">ClickableSpan</A><br>
+<A HREF="android.content.res.Configuration.html" class="hiddenlink" target="rightframe">Configuration</A><br>
+<A HREF="android.net.ConnectivityManager.html" class="hiddenlink" target="rightframe">ConnectivityManager</A><br>
+<A HREF="android.provider.Contacts.Intents.html" class="hiddenlink" target="rightframe">Contacts.Intents</A><br>
+<A HREF="android.provider.Contacts.Intents.Insert.html" class="hiddenlink" target="rightframe">Contacts.Intents.Insert</A><br>
+<A HREF="android.provider.Contacts.PeopleColumns.html" class="hiddenlink" target="rightframe"><i>Contacts.PeopleColumns</i></A><br>
+<A HREF="android.content.ContentProvider.html" class="hiddenlink" target="rightframe">ContentProvider</A><br>
+<A HREF="android.content.ContentResolver.html" class="hiddenlink" target="rightframe">ContentResolver</A><br>
+<A HREF="android.content.Context.html" class="hiddenlink" target="rightframe">Context</A><br>
+<A HREF="android.database.Cursor.html" class="hiddenlink" target="rightframe"><i>Cursor</i></A><br>
+<A HREF="android.widget.CursorAdapter.html" class="hiddenlink" target="rightframe">CursorAdapter</A><br>
+<A HREF="android.database.CursorWrapper.html" class="hiddenlink" target="rightframe">CursorWrapper</A><br>
+<A NAME="D"></A>
+<br><font size="+2">D</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.database.DatabaseUtils.html" class="hiddenlink" target="rightframe">DatabaseUtils</A><br>
+<A HREF="java.util.Date.html" class="hiddenlink" target="rightframe">Date</A><br>
+<A HREF="android.text.method.DateKeyListener.html" class="hiddenlink" target="rightframe">DateKeyListener</A><br>
+<A HREF="android.text.method.DateTimeKeyListener.html" class="hiddenlink" target="rightframe">DateTimeKeyListener</A><br>
+<A HREF="android.os.Debug.html" class="hiddenlink" target="rightframe">Debug</A><br>
+<A HREF="dalvik.system.DexFile.html" class="hiddenlink" target="rightframe">DexFile</A><br>
+<A HREF="android.text.method.DialerKeyListener.html" class="hiddenlink" target="rightframe">DialerKeyListener</A><br>
+<A HREF="android.content.DialogInterface.html" class="hiddenlink" target="rightframe"><i>DialogInterface</i></A><br>
+<A HREF="android.preference.DialogPreference.html" class="hiddenlink" target="rightframe">DialogPreference</A><br>
+<A HREF="android.text.method.DigitsKeyListener.html" class="hiddenlink" target="rightframe">DigitsKeyListener</A><br>
+<A HREF="android.graphics.drawable.Drawable.html" class="hiddenlink" target="rightframe">Drawable</A><br>
+<A HREF="android.text.style.DynamicDrawableSpan.html" class="hiddenlink" target="rightframe">DynamicDrawableSpan</A><br>
+<A NAME="E"></A>
+<br><font size="+2">E</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.os.Environment.html" class="hiddenlink" target="rightframe">Environment</A><br>
+<A NAME="F"></A>
+<br><font size="+2">F</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.text.style.ForegroundColorSpan.html" class="hiddenlink" target="rightframe">ForegroundColorSpan</A><br>
+<A NAME="G"></A>
+<br><font size="+2">G</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.view.GestureDetector.html" class="hiddenlink" target="rightframe">GestureDetector</A><br>
+<A HREF="android.view.GestureDetector.SimpleOnGestureListener.html" class="hiddenlink" target="rightframe">GestureDetector.SimpleOnGestureListener</A><br>
+<A HREF="android.view.Gravity.html" class="hiddenlink" target="rightframe">Gravity</A><br>
+<A HREF="android.widget.GridView.html" class="hiddenlink" target="rightframe">GridView</A><br>
+<A NAME="H"></A>
+<br><font size="+2">H</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.os.Handler.html" class="hiddenlink" target="rightframe">Handler</A><br>
+<A NAME="I"></A>
+<br><font size="+2">I</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.os.IBinder.html" class="hiddenlink" target="rightframe"><i>IBinder</i></A><br>
+<A HREF="android.text.style.ImageSpan.html" class="hiddenlink" target="rightframe">ImageSpan</A><br>
+<A HREF="android.app.Instrumentation.html" class="hiddenlink" target="rightframe">Instrumentation</A><br>
+<A HREF="android.test.InstrumentationTestCase.html" class="hiddenlink" target="rightframe">InstrumentationTestCase</A><br>
+<A HREF="android.content.Intent.html" class="hiddenlink" target="rightframe">Intent</A><br>
+<A NAME="K"></A>
+<br><font size="+2">K</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.view.KeyCharacterMap.html" class="hiddenlink" target="rightframe">KeyCharacterMap</A><br>
+<A HREF="android.view.KeyEvent.html" class="hiddenlink" target="rightframe">KeyEvent</A><br>
+<A HREF="android.text.method.KeyListener.html" class="hiddenlink" target="rightframe"><i>KeyListener</i></A><br>
+<A NAME="L"></A>
+<br><font size="+2">L</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.app.LauncherActivity.html" class="hiddenlink" target="rightframe">LauncherActivity</A><br>
+<A HREF="android.text.style.LeadingMarginSpan.Standard.html" class="hiddenlink" target="rightframe">LeadingMarginSpan.Standard</A><br>
+<A HREF="java.util.logging.Level.html" class="hiddenlink" target="rightframe">Level</A><br>
+<A HREF="android.widget.ListView.html" class="hiddenlink" target="rightframe">ListView</A><br>
+<A HREF="android.location.Location.html" class="hiddenlink" target="rightframe">Location</A><br>
+<A HREF="android.location.LocationManager.html" class="hiddenlink" target="rightframe">LocationManager</A><br>
+<A HREF="java.util.logging.LogManager.html" class="hiddenlink" target="rightframe">LogManager</A><br>
+<A HREF="android.os.Looper.html" class="hiddenlink" target="rightframe">Looper</A><br>
+<A NAME="M"></A>
+<br><font size="+2">M</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.Manifest.permission.html" class="hiddenlink" target="rightframe">Manifest.permission</A><br>
+<A HREF="android.text.style.MaskFilterSpan.html" class="hiddenlink" target="rightframe">MaskFilterSpan</A><br>
+<A HREF="android.media.MediaPlayer.html" class="hiddenlink" target="rightframe">MediaPlayer</A><br>
+<A HREF="android.media.MediaRecorder.html" class="hiddenlink" target="rightframe">MediaRecorder</A><br>
+<A HREF="android.media.MediaRecorder.OutputFormat.html" class="hiddenlink" target="rightframe">MediaRecorder.OutputFormat</A><br>
+<A HREF="android.provider.MediaStore.html" class="hiddenlink" target="rightframe">MediaStore</A><br>
+<A HREF="android.provider.MediaStore.Audio.AlbumColumns.html" class="hiddenlink" target="rightframe"><i>MediaStore.Audio.AlbumColumns</i></A><br>
+<A HREF="android.provider.MediaStore.Audio.Media.html" class="hiddenlink" target="rightframe">MediaStore.Audio.Media</A><br>
+<A HREF="android.provider.MediaStore.Images.Media.html" class="hiddenlink" target="rightframe">MediaStore.Images.Media</A><br>
+<A HREF="android.provider.MediaStore.Video.html" class="hiddenlink" target="rightframe">MediaStore.Video</A><br>
+<A HREF="android.provider.MediaStore.Video.VideoColumns.html" class="hiddenlink" target="rightframe"><i>MediaStore.Video.VideoColumns</i></A><br>
+<A HREF="android.view.Menu.html" class="hiddenlink" target="rightframe"><i>Menu</i></A><br>
+<A HREF="android.text.method.MetaKeyKeyListener.html" class="hiddenlink" target="rightframe">MetaKeyKeyListener</A><br>
+<A HREF="android.test.mock.MockPackageManager.html" class="hiddenlink" target="rightframe">MockPackageManager</A><br>
+<A HREF="android.view.MotionEvent.html" class="hiddenlink" target="rightframe">MotionEvent</A><br>
+<A HREF="android.text.method.MovementMethod.html" class="hiddenlink" target="rightframe"><i>MovementMethod</i></A><br>
+<A HREF="android.text.method.MultiTapKeyListener.html" class="hiddenlink" target="rightframe">MultiTapKeyListener</A><br>
+<A NAME="N"></A>
+<br><font size="+2">N</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.net.NetworkInfo.html" class="hiddenlink" target="rightframe">NetworkInfo</A><br>
+<A NAME="O"></A>
+<br><font size="+2">O</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.view.OrientationListener.html" class="hiddenlink" target="rightframe">OrientationListener</A><br>
+<A NAME="P"></A>
+<br><font size="+2">P</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="java.util.jar.Pack200.Packer.html" class="hiddenlink" target="rightframe"><i>Pack200.Packer</i></A><br>
+<A HREF="java.util.jar.Pack200.Unpacker.html" class="hiddenlink" target="rightframe"><i>Pack200.Unpacker</i></A><br>
+<A HREF="android.content.pm.PackageInfo.html" class="hiddenlink" target="rightframe">PackageInfo</A><br>
+<A HREF="android.content.pm.PackageManager.html" class="hiddenlink" target="rightframe">PackageManager</A><br>
+<A HREF="android.os.Parcel.html" class="hiddenlink" target="rightframe">Parcel</A><br>
+<A HREF="android.os.ParcelFileDescriptor.html" class="hiddenlink" target="rightframe">ParcelFileDescriptor</A><br>
+<A HREF="android.app.PendingIntent.html" class="hiddenlink" target="rightframe">PendingIntent</A><br>
+<A HREF="android.telephony.PhoneNumberUtils.html" class="hiddenlink" target="rightframe">PhoneNumberUtils</A><br>
+<A HREF="android.widget.PopupWindow.html" class="hiddenlink" target="rightframe">PopupWindow</A><br>
+<A HREF="android.widget.PopupWindow.OnDismissListener.html" class="hiddenlink" target="rightframe"><i>PopupWindow.OnDismissListener</i></A><br>
+<A HREF="android.widget.ProgressBar.html" class="hiddenlink" target="rightframe">ProgressBar</A><br>
+<A HREF="android.test.ProviderTestCase.html" class="hiddenlink" target="rightframe">ProviderTestCase</A><br>
+<A HREF="java.lang.reflect.Proxy.html" class="hiddenlink" target="rightframe">Proxy</A><br>
+<A NAME="Q"></A>
+<br><font size="+2">Q</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.text.style.QuoteSpan.html" class="hiddenlink" target="rightframe">QuoteSpan</A><br>
+<A HREF="android.text.method.QwertyKeyListener.html" class="hiddenlink" target="rightframe">QwertyKeyListener</A><br>
+<A NAME="R"></A>
+<br><font size="+2">R</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.R.attr.html" class="hiddenlink" target="rightframe">R.attr</A><br>
+<A HREF="android.R.drawable.html" class="hiddenlink" target="rightframe">R.drawable</A><br>
+<A HREF="android.R.id.html" class="hiddenlink" target="rightframe">R.id</A><br>
+<A HREF="android.R.string.html" class="hiddenlink" target="rightframe">R.string</A><br>
+<A HREF="android.R.style.html" class="hiddenlink" target="rightframe">R.style</A><br>
+<A HREF="android.text.style.RasterizerSpan.html" class="hiddenlink" target="rightframe">RasterizerSpan</A><br>
+<A HREF="android.graphics.Rect.html" class="hiddenlink" target="rightframe">Rect</A><br>
+<A HREF="android.graphics.RectF.html" class="hiddenlink" target="rightframe">RectF</A><br>
+<A HREF="android.text.style.RelativeSizeSpan.html" class="hiddenlink" target="rightframe">RelativeSizeSpan</A><br>
+<A HREF="android.widget.RemoteViews.html" class="hiddenlink" target="rightframe">RemoteViews</A><br>
+<A HREF="android.widget.RemoteViews.ActionException.html" class="hiddenlink" target="rightframe">RemoteViews.ActionException</A><br>
+<A HREF="android.widget.ResourceCursorAdapter.html" class="hiddenlink" target="rightframe">ResourceCursorAdapter</A><br>
+<A HREF="android.content.res.Resources.html" class="hiddenlink" target="rightframe">Resources</A><br>
+<A HREF="android.media.RingtoneManager.html" class="hiddenlink" target="rightframe">RingtoneManager</A><br>
+<A HREF="android.graphics.drawable.RotateDrawable.html" class="hiddenlink" target="rightframe">RotateDrawable</A><br>
+<A NAME="S"></A>
+<br><font size="+2">S</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.graphics.drawable.ScaleDrawable.html" class="hiddenlink" target="rightframe">ScaleDrawable</A><br>
+<A HREF="android.text.style.ScaleXSpan.html" class="hiddenlink" target="rightframe">ScaleXSpan</A><br>
+<A HREF="android.widget.Scroller.html" class="hiddenlink" target="rightframe">Scroller</A><br>
+<A HREF="android.text.method.ScrollingMovementMethod.html" class="hiddenlink" target="rightframe">ScrollingMovementMethod</A><br>
+<A HREF="android.hardware.SensorListener.html" class="hiddenlink" target="rightframe"><i>SensorListener</i></A><br>
+<A HREF="android.hardware.SensorManager.html" class="hiddenlink" target="rightframe">SensorManager</A><br>
+<A HREF="android.provider.Settings.html" class="hiddenlink" target="rightframe">Settings</A><br>
+<A HREF="android.provider.Settings.System.html" class="hiddenlink" target="rightframe">Settings.System</A><br>
+<A HREF="android.graphics.drawable.shapes.Shape.html" class="hiddenlink" target="rightframe">Shape</A><br>
+<A HREF="android.widget.SimpleCursorAdapter.html" class="hiddenlink" target="rightframe">SimpleCursorAdapter</A><br>
+<A HREF="android.telephony.gsm.SmsMessage.html" class="hiddenlink" target="rightframe">SmsMessage</A><br>
+<A HREF="java.net.Socket.html" class="hiddenlink" target="rightframe">Socket</A><br>
+<A HREF="android.media.SoundPool.html" class="hiddenlink" target="rightframe">SoundPool</A><br>
+<A HREF="android.text.Spanned.html" class="hiddenlink" target="rightframe"><i>Spanned</i></A><br>
+<A HREF="android.text.SpanWatcher.html" class="hiddenlink" target="rightframe"><i>SpanWatcher</i></A><br>
+<A HREF="android.util.SparseIntArray.html" class="hiddenlink" target="rightframe">SparseIntArray</A><br>
+<A HREF="android.database.sqlite.SQLiteDatabase.html" class="hiddenlink" target="rightframe">SQLiteDatabase</A><br>
+<A HREF="android.text.style.StrikethroughSpan.html" class="hiddenlink" target="rightframe">StrikethroughSpan</A><br>
+<A HREF="java.lang.String.html" class="hiddenlink" target="rightframe">String</A><br>
+<A HREF="android.text.style.StyleSpan.html" class="hiddenlink" target="rightframe">StyleSpan</A><br>
+<A HREF="android.text.style.SubscriptSpan.html" class="hiddenlink" target="rightframe">SubscriptSpan</A><br>
+<A HREF="android.text.style.SuperscriptSpan.html" class="hiddenlink" target="rightframe">SuperscriptSpan</A><br>
+<A NAME="T"></A>
+<br><font size="+2">T</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.telephony.TelephonyManager.html" class="hiddenlink" target="rightframe">TelephonyManager</A><br>
+<A HREF="android.test.suitebuilder.TestMethod.html" class="hiddenlink" target="rightframe">TestMethod</A><br>
+<A HREF="android.test.suitebuilder.TestSuiteBuilder.html" class="hiddenlink" target="rightframe">TestSuiteBuilder</A><br>
+<A HREF="android.text.style.TextAppearanceSpan.html" class="hiddenlink" target="rightframe">TextAppearanceSpan</A><br>
+<A HREF="android.text.method.TextKeyListener.html" class="hiddenlink" target="rightframe">TextKeyListener</A><br>
+<A HREF="android.text.TextUtils.html" class="hiddenlink" target="rightframe">TextUtils</A><br>
+<A HREF="android.widget.TextView.html" class="hiddenlink" target="rightframe">TextView</A><br>
+<A HREF="android.text.TextWatcher.html" class="hiddenlink" target="rightframe"><i>TextWatcher</i></A><br>
+<A HREF="android.text.method.TimeKeyListener.html" class="hiddenlink" target="rightframe">TimeKeyListener</A><br>
+<A HREF="android.util.TimeUtils.html" class="hiddenlink" target="rightframe">TimeUtils</A><br>
+<A HREF="android.text.method.Touch.html" class="hiddenlink" target="rightframe">Touch</A><br>
+<A HREF="android.test.TouchUtils.html" class="hiddenlink" target="rightframe">TouchUtils</A><br>
+<A HREF="android.view.animation.Transformation.html" class="hiddenlink" target="rightframe">Transformation</A><br>
+<A HREF="android.graphics.drawable.TransitionDrawable.html" class="hiddenlink" target="rightframe">TransitionDrawable</A><br>
+<A HREF="android.content.res.TypedArray.html" class="hiddenlink" target="rightframe">TypedArray</A><br>
+<A HREF="android.text.style.TypefaceSpan.html" class="hiddenlink" target="rightframe">TypefaceSpan</A><br>
+<A NAME="U"></A>
+<br><font size="+2">U</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.text.style.UnderlineSpan.html" class="hiddenlink" target="rightframe">UnderlineSpan</A><br>
+<A HREF="android.text.style.UpdateLayout.html" class="hiddenlink" target="rightframe"><i>UpdateLayout</i></A><br>
+<A HREF="android.webkit.UrlInterceptHandler.html" class="hiddenlink" target="rightframe"><i>UrlInterceptHandler</i></A><br>
+<A HREF="android.webkit.UrlInterceptRegistry.html" class="hiddenlink" target="rightframe">UrlInterceptRegistry</A><br>
+<A HREF="android.text.style.URLSpan.html" class="hiddenlink" target="rightframe">URLSpan</A><br>
+<A HREF="android.webkit.URLUtil.html" class="hiddenlink" target="rightframe">URLUtil</A><br>
+<A NAME="V"></A>
+<br><font size="+2">V</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.view.View.html" class="hiddenlink" target="rightframe">View</A><br>
+<A HREF="android.view.ViewConfiguration.html" class="hiddenlink" target="rightframe">ViewConfiguration</A><br>
+<A HREF="android.view.ViewDebug.html" class="hiddenlink" target="rightframe">ViewDebug</A><br>
+<A HREF="android.view.ViewGroup.html" class="hiddenlink" target="rightframe">ViewGroup</A><br>
+<A HREF="android.view.ViewParent.html" class="hiddenlink" target="rightframe"><i>ViewParent</i></A><br>
+<A HREF="android.view.ViewTreeObserver.html" class="hiddenlink" target="rightframe">ViewTreeObserver</A><br>
+<A HREF="dalvik.system.VMDebug.html" class="hiddenlink" target="rightframe">VMDebug</A><br>
+<A NAME="W"></A>
+<br><font size="+2">W</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="android.webkit.WebHistoryItem.html" class="hiddenlink" target="rightframe">WebHistoryItem</A><br>
+<A HREF="android.webkit.WebSettings.html" class="hiddenlink" target="rightframe">WebSettings</A><br>
+<A HREF="android.webkit.WebView.html" class="hiddenlink" target="rightframe">WebView</A><br>
+<A HREF="android.net.wifi.WifiManager.html" class="hiddenlink" target="rightframe">WifiManager</A><br>
+<A HREF="android.view.Window.html" class="hiddenlink" target="rightframe">Window</A><br>
+<A HREF="android.view.WindowManager.LayoutParams.html" class="hiddenlink" target="rightframe">WindowManager.LayoutParams</A><br>
+<A NAME="Z"></A>
+<br><font size="+2">Z</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="dalvik.system.Zygote.html" class="hiddenlink" target="rightframe">Zygote</A><br>
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/classes_index_removals.html b/docs/html/sdk/api_diff/3/changes/classes_index_removals.html
new file mode 100644
index 000000000000..bc5e2e821957
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/classes_index_removals.html
@@ -0,0 +1,62 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+Class Removals Index
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY class="gc-documentation">
+<a NAME="topheader"></a>
+<table summary="Index for Classes" width="100%" class="jdiffIndex" border="0" cellspacing="0" cellpadding="0" style="padding-bottom:0;margin-bottom:0;">
+  <tr>
+  <th class="indexHeader">
+    Filter the Index:
+  </th>
+  </tr>
+  <tr>
+  <td class="indexText" style="line-height:1.3em;padding-left:2em;">
+<a href="classes_index_all.html" class="staysblack">All Classes</a>
+  <br>
+<font color="#999999">Removals</font>
+  <br>
+<A HREF="classes_index_additions.html"xclass="hiddenlink">Additions</A>
+  <br>
+<A HREF="classes_index_changes.html"xclass="hiddenlink">Changes</A>
+  </td>
+  </tr>
+</table>
+<div id="indexTableCaption">
+<font size="-2"><strong>Bold</strong>&nbsp;indicates&nbsp;New;&nbsp;<strike>Strike</strike>&nbsp;indicates&nbsp;deleted. Plain indicates changed.</font>
+</div>
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/constructors_index_additions.html b/docs/html/sdk/api_diff/3/changes/constructors_index_additions.html
new file mode 100644
index 000000000000..0dff7fe55a96
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/constructors_index_additions.html
@@ -0,0 +1,409 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+Constructor Additions Index
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY class="gc-documentation">
+<a NAME="topheader"></a>
+<table summary="Index for Constructors" width="100%" class="jdiffIndex" border="0" cellspacing="0" cellpadding="0" style="padding-bottom:0;margin-bottom:0;">
+  <tr>
+  <th class="indexHeader">
+    Filter the Index:
+  </th>
+  </tr>
+  <tr>
+  <td class="indexText" style="line-height:1.3em;padding-left:2em;">
+<a href="constructors_index_all.html" class="staysblack">All Constructors</a>
+  <br>
+<A HREF="constructors_index_removals.html" xclass="hiddenlink">Removals</A>
+  <br>
+<b>Additions</b>
+  <br>
+<A HREF="constructors_index_changes.html"xclass="hiddenlink">Changes</A>
+  </td>
+  </tr>
+</table>
+<div id="indexTableCaption">
+<font size="-2"><strong>Bold</strong>&nbsp;indicates&nbsp;New;&nbsp;<strike>Strike</strike>&nbsp;indicates&nbsp;deleted. Plain indicates changed.</font>
+</div>
+<A NAME="A"></A>
+<br><font size="+2">A</font>&nbsp;
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.text.style.AbsoluteSizeSpan.html#android.text.style.AbsoluteSizeSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>AbsoluteSizeSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<nobr><A HREF="android.text.style.AlignmentSpan.Standard.html#android.text.style.AlignmentSpan.Standard.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>AlignmentSpan.Standard</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<nobr><A HREF="android.text.Annotation.html#android.text.Annotation.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>Annotation</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<A NAME="B"></A>
+<br><font size="+2">B</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.text.style.BackgroundColorSpan.html#android.text.style.BackgroundColorSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>BackgroundColorSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<nobr><A HREF="android.text.style.BulletSpan.html#android.text.style.BulletSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>BulletSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<A NAME="D"></A>
+<br><font size="+2">D</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.text.style.DynamicDrawableSpan.html#android.text.style.DynamicDrawableSpan.ctor_added(int)" class="hiddenlink" target="rightframe"><b>DynamicDrawableSpan</b>
+(<code>int</code>)</A></nobr>&nbsp;constructor<br>
+<A NAME="F"></A>
+<br><font size="+2">F</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.text.style.ForegroundColorSpan.html#android.text.style.ForegroundColorSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>ForegroundColorSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<A NAME="G"></A>
+<br><font size="+2">G</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<i>GestureDetector</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.view.GestureDetector.html#android.view.GestureDetector.ctor_added(android.content.Context, android.view.GestureDetector.OnGestureListener)" class="hiddenlink" target="rightframe"><b>GestureDetector</b>
+(<code>Context, OnGestureListener</code>)</A></nobr>&nbsp;constructor<br>
+&nbsp;&nbsp;<nobr><A HREF="android.view.GestureDetector.html#android.view.GestureDetector.ctor_added(android.content.Context, android.view.GestureDetector.OnGestureListener, android.os.Handler)" class="hiddenlink" target="rightframe"><b>GestureDetector</b>
+(<code>Context, OnGestureListener, Handler</code>)</A></nobr>&nbsp;constructor<br>
+<A NAME="H"></A>
+<br><font size="+2">H</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<i>Handler</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.os.Handler.html#android.os.Handler.ctor_added(android.os.Handler.Callback)" class="hiddenlink" target="rightframe"><b>Handler</b>
+(<code>Callback</code>)</A></nobr>&nbsp;constructor<br>
+&nbsp;&nbsp;<nobr><A HREF="android.os.Handler.html#android.os.Handler.ctor_added(android.os.Looper, android.os.Handler.Callback)" class="hiddenlink" target="rightframe"><b>Handler</b>
+(<code>Looper, Callback</code>)</A></nobr>&nbsp;constructor<br>
+<A NAME="I"></A>
+<br><font size="+2">I</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<i>ImageSpan</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.ImageSpan.html#android.text.style.ImageSpan.ctor_added(android.content.Context, android.net.Uri, int)" class="hiddenlink" target="rightframe"><b>ImageSpan</b>
+(<code>Context, Uri, int</code>)</A></nobr>&nbsp;constructor<br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.ImageSpan.html#android.text.style.ImageSpan.ctor_added(android.content.Context, int, int)" class="hiddenlink" target="rightframe"><b>ImageSpan</b>
+(<code>Context, int, int</code>)</A></nobr>&nbsp;constructor<br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.ImageSpan.html#android.text.style.ImageSpan.ctor_added(android.graphics.Bitmap, int)" class="hiddenlink" target="rightframe"><b>ImageSpan</b>
+(<code>Bitmap, int</code>)</A></nobr>&nbsp;constructor<br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.ImageSpan.html#android.text.style.ImageSpan.ctor_added(android.graphics.drawable.Drawable, int)" class="hiddenlink" target="rightframe"><b>ImageSpan</b>
+(<code>Drawable, int</code>)</A></nobr>&nbsp;constructor<br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.ImageSpan.html#android.text.style.ImageSpan.ctor_added(android.graphics.drawable.Drawable, java.lang.String, int)" class="hiddenlink" target="rightframe"><b>ImageSpan</b>
+(<code>Drawable, String, int</code>)</A></nobr>&nbsp;constructor<br>
+<A NAME="K"></A>
+<br><font size="+2">K</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<i>KeyEvent</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.ctor_added(android.view.KeyEvent)" class="hiddenlink" target="rightframe"><b>KeyEvent</b>
+(<code>KeyEvent</code>)</A></nobr>&nbsp;constructor<br>
+&nbsp;&nbsp;<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.ctor_added(long, java.lang.String, int, int)" class="hiddenlink" target="rightframe"><b>KeyEvent</b>
+(<code>long, String, int, int</code>)</A></nobr>&nbsp;constructor<br>
+<A NAME="L"></A>
+<br><font size="+2">L</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.text.style.LeadingMarginSpan.Standard.html#android.text.style.LeadingMarginSpan.Standard.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>LeadingMarginSpan.Standard</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<A NAME="O"></A>
+<br><font size="+2">O</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.view.OrientationListener.html#android.view.OrientationListener.ctor_added(android.content.Context, int)" class="hiddenlink" target="rightframe"><b>OrientationListener</b>
+(<code>Context, int</code>)</A></nobr>&nbsp;constructor<br>
+<A NAME="Q"></A>
+<br><font size="+2">Q</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.text.style.QuoteSpan.html#android.text.style.QuoteSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>QuoteSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<A NAME="R"></A>
+<br><font size="+2">R</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.text.style.RelativeSizeSpan.html#android.text.style.RelativeSizeSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>RelativeSizeSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<nobr><A HREF="android.widget.RemoteViews.ActionException.html#android.widget.RemoteViews.ActionException.ctor_added(java.lang.Exception)" class="hiddenlink" target="rightframe"><b>RemoteViews.ActionException</b>
+(<code>Exception</code>)</A></nobr>&nbsp;constructor<br>
+<nobr><A HREF="android.widget.ResourceCursorAdapter.html#android.widget.ResourceCursorAdapter.ctor_added(android.content.Context, int, android.database.Cursor, boolean)" class="hiddenlink" target="rightframe"><b>ResourceCursorAdapter</b>
+(<code>Context, int, Cursor, boolean</code>)</A></nobr>&nbsp;constructor<br>
+<A NAME="S"></A>
+<br><font size="+2">S</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.text.style.ScaleXSpan.html#android.text.style.ScaleXSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>ScaleXSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<nobr><A HREF="android.text.style.StrikethroughSpan.html#android.text.style.StrikethroughSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>StrikethroughSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<nobr><A HREF="android.text.style.StyleSpan.html#android.text.style.StyleSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>StyleSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<nobr><A HREF="android.text.style.SubscriptSpan.html#android.text.style.SubscriptSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>SubscriptSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<nobr><A HREF="android.text.style.SuperscriptSpan.html#android.text.style.SuperscriptSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>SuperscriptSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<A NAME="T"></A>
+<br><font size="+2">T</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<i>TestMethod</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.suitebuilder.TestMethod.html#android.test.suitebuilder.TestMethod.ctor_added(java.lang.String, java.lang.Class<? extends junit.framework.TestCase>)" class="hiddenlink" target="rightframe"><b>TestMethod</b>
+(<code>String, Class&lt;TestCase&gt;</code>)</A></nobr>&nbsp;constructor<br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.suitebuilder.TestMethod.html#android.test.suitebuilder.TestMethod.ctor_added(junit.framework.TestCase)" class="hiddenlink" target="rightframe"><b>TestMethod</b>
+(<code>TestCase</code>)</A></nobr>&nbsp;constructor<br>
+<nobr><A HREF="android.text.style.TextAppearanceSpan.html#android.text.style.TextAppearanceSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>TextAppearanceSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<nobr><A HREF="android.graphics.drawable.TransitionDrawable.html#android.graphics.drawable.TransitionDrawable.ctor_added(android.graphics.drawable.Drawable[])" class="hiddenlink" target="rightframe"><b>TransitionDrawable</b>
+(<code>Drawable[]</code>)</A></nobr>&nbsp;constructor<br>
+<nobr><A HREF="android.text.style.TypefaceSpan.html#android.text.style.TypefaceSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>TypefaceSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<A NAME="U"></A>
+<br><font size="+2">U</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.text.style.UnderlineSpan.html#android.text.style.UnderlineSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>UnderlineSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<nobr><A HREF="android.text.style.URLSpan.html#android.text.style.URLSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>URLSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/constructors_index_all.html b/docs/html/sdk/api_diff/3/changes/constructors_index_all.html
new file mode 100644
index 000000000000..49ad673c48aa
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/constructors_index_all.html
@@ -0,0 +1,514 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+Constructor Differences Index
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY class="gc-documentation">
+<a NAME="topheader"></a>
+<table summary="Index for Constructors" width="100%" class="jdiffIndex" border="0" cellspacing="0" cellpadding="0" style="padding-bottom:0;margin-bottom:0;">
+  <tr>
+  <th class="indexHeader">
+    Filter the Index:
+  </th>
+  </tr>
+  <tr>
+  <td class="indexText" style="line-height:1.3em;padding-left:2em;">
+<b>Constructors</b>
+  <br>
+<A HREF="constructors_index_removals.html" xclass="hiddenlink">Removals</A>
+  <br>
+<A HREF="constructors_index_additions.html"xclass="hiddenlink">Additions</A>
+  <br>
+<A HREF="constructors_index_changes.html"xclass="hiddenlink">Changes</A>
+  </td>
+  </tr>
+</table>
+<div id="indexTableCaption">
+<font size="-2"><strong>Bold</strong>&nbsp;indicates&nbsp;New;&nbsp;<strike>Strike</strike>&nbsp;indicates&nbsp;deleted. Plain indicates changed.</font>
+</div>
+<A NAME="A"></A>
+<br><font size="+2">A</font>&nbsp;
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.text.style.AbsoluteSizeSpan.html#android.text.style.AbsoluteSizeSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>AbsoluteSizeSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<nobr><A HREF="android.text.style.AlignmentSpan.Standard.html#android.text.style.AlignmentSpan.Standard.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>AlignmentSpan.Standard</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<nobr><A HREF="android.text.Annotation.html#android.text.Annotation.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>Annotation</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<A NAME="B"></A>
+<br><font size="+2">B</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.text.style.BackgroundColorSpan.html#android.text.style.BackgroundColorSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>BackgroundColorSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<nobr><A HREF="android.text.style.BulletSpan.html#android.text.style.BulletSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>BulletSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<A NAME="D"></A>
+<br><font size="+2">D</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<i>Date</i><br>
+&nbsp;&nbsp;<nobr><A HREF="java.util.Date.html#java.util.Date.ctor_changed()" class="hiddenlink" target="rightframe">Date
+()</A></nobr>&nbsp;constructor<br>
+&nbsp;&nbsp;<nobr><A HREF="java.util.Date.html#java.util.Date.ctor_changed(int, int, int, int, int, int)" class="hiddenlink" target="rightframe">Date
+(<code>int, int, int, int, int, int</code>)</A></nobr>&nbsp;constructor<br>
+<nobr><A HREF="android.text.style.DynamicDrawableSpan.html#android.text.style.DynamicDrawableSpan.ctor_added(int)" class="hiddenlink" target="rightframe"><b>DynamicDrawableSpan</b>
+(<code>int</code>)</A></nobr>&nbsp;constructor<br>
+<A NAME="F"></A>
+<br><font size="+2">F</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.text.style.ForegroundColorSpan.html#android.text.style.ForegroundColorSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>ForegroundColorSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<A NAME="G"></A>
+<br><font size="+2">G</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<i>GestureDetector</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.view.GestureDetector.html#android.view.GestureDetector.ctor_added(android.content.Context, android.view.GestureDetector.OnGestureListener)" class="hiddenlink" target="rightframe"><b>GestureDetector</b>
+(<code>Context, OnGestureListener</code>)</A></nobr>&nbsp;constructor<br>
+&nbsp;&nbsp;<nobr><A HREF="android.view.GestureDetector.html#android.view.GestureDetector.ctor_added(android.content.Context, android.view.GestureDetector.OnGestureListener, android.os.Handler)" class="hiddenlink" target="rightframe"><b>GestureDetector</b>
+(<code>Context, OnGestureListener, Handler</code>)</A></nobr>&nbsp;constructor<br>
+&nbsp;&nbsp;<nobr><A HREF="android.view.GestureDetector.html#android.view.GestureDetector.ctor_changed(android.view.GestureDetector.OnGestureListener)" class="hiddenlink" target="rightframe">GestureDetector
+(<code>OnGestureListener</code>)</A></nobr>&nbsp;constructor<br>
+&nbsp;&nbsp;<nobr><A HREF="android.view.GestureDetector.html#android.view.GestureDetector.ctor_changed(android.view.GestureDetector.OnGestureListener, android.os.Handler)" class="hiddenlink" target="rightframe">GestureDetector
+(<code>OnGestureListener, Handler</code>)</A></nobr>&nbsp;constructor<br>
+<A NAME="H"></A>
+<br><font size="+2">H</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<i>Handler</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.os.Handler.html#android.os.Handler.ctor_added(android.os.Handler.Callback)" class="hiddenlink" target="rightframe"><b>Handler</b>
+(<code>Callback</code>)</A></nobr>&nbsp;constructor<br>
+&nbsp;&nbsp;<nobr><A HREF="android.os.Handler.html#android.os.Handler.ctor_added(android.os.Looper, android.os.Handler.Callback)" class="hiddenlink" target="rightframe"><b>Handler</b>
+(<code>Looper, Callback</code>)</A></nobr>&nbsp;constructor<br>
+<A NAME="I"></A>
+<br><font size="+2">I</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<i>ImageSpan</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.ImageSpan.html#android.text.style.ImageSpan.ctor_added(android.content.Context, android.net.Uri, int)" class="hiddenlink" target="rightframe"><b>ImageSpan</b>
+(<code>Context, Uri, int</code>)</A></nobr>&nbsp;constructor<br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.ImageSpan.html#android.text.style.ImageSpan.ctor_added(android.content.Context, int, int)" class="hiddenlink" target="rightframe"><b>ImageSpan</b>
+(<code>Context, int, int</code>)</A></nobr>&nbsp;constructor<br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.ImageSpan.html#android.text.style.ImageSpan.ctor_added(android.graphics.Bitmap, int)" class="hiddenlink" target="rightframe"><b>ImageSpan</b>
+(<code>Bitmap, int</code>)</A></nobr>&nbsp;constructor<br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.ImageSpan.html#android.text.style.ImageSpan.ctor_added(android.graphics.drawable.Drawable, int)" class="hiddenlink" target="rightframe"><b>ImageSpan</b>
+(<code>Drawable, int</code>)</A></nobr>&nbsp;constructor<br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.ImageSpan.html#android.text.style.ImageSpan.ctor_added(android.graphics.drawable.Drawable, java.lang.String, int)" class="hiddenlink" target="rightframe"><b>ImageSpan</b>
+(<code>Drawable, String, int</code>)</A></nobr>&nbsp;constructor<br>
+<A NAME="K"></A>
+<br><font size="+2">K</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<i>KeyEvent</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.ctor_added(android.view.KeyEvent)" class="hiddenlink" target="rightframe"><b>KeyEvent</b>
+(<code>KeyEvent</code>)</A></nobr>&nbsp;constructor<br>
+&nbsp;&nbsp;<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.ctor_added(long, java.lang.String, int, int)" class="hiddenlink" target="rightframe"><b>KeyEvent</b>
+(<code>long, String, int, int</code>)</A></nobr>&nbsp;constructor<br>
+<A NAME="L"></A>
+<br><font size="+2">L</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.text.style.LeadingMarginSpan.Standard.html#android.text.style.LeadingMarginSpan.Standard.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>LeadingMarginSpan.Standard</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<A NAME="N"></A>
+<br><font size="+2">N</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.net.NetworkInfo.html#android.net.NetworkInfo.ctor_removed(int)" class="hiddenlink" target="rightframe"><strike>NetworkInfo</strike>
+(<code>int</code>)</A></nobr>&nbsp;constructor<br>
+<A NAME="O"></A>
+<br><font size="+2">O</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.view.OrientationListener.html#android.view.OrientationListener.ctor_added(android.content.Context, int)" class="hiddenlink" target="rightframe"><b>OrientationListener</b>
+(<code>Context, int</code>)</A></nobr>&nbsp;constructor<br>
+<A NAME="Q"></A>
+<br><font size="+2">Q</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.text.style.QuoteSpan.html#android.text.style.QuoteSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>QuoteSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<A NAME="R"></A>
+<br><font size="+2">R</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.text.style.RelativeSizeSpan.html#android.text.style.RelativeSizeSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>RelativeSizeSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<nobr><A HREF="android.widget.RemoteViews.ActionException.html#android.widget.RemoteViews.ActionException.ctor_added(java.lang.Exception)" class="hiddenlink" target="rightframe"><b>RemoteViews.ActionException</b>
+(<code>Exception</code>)</A></nobr>&nbsp;constructor<br>
+<nobr><A HREF="android.widget.ResourceCursorAdapter.html#android.widget.ResourceCursorAdapter.ctor_added(android.content.Context, int, android.database.Cursor, boolean)" class="hiddenlink" target="rightframe"><b>ResourceCursorAdapter</b>
+(<code>Context, int, Cursor, boolean</code>)</A></nobr>&nbsp;constructor<br>
+<A NAME="S"></A>
+<br><font size="+2">S</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.text.style.ScaleXSpan.html#android.text.style.ScaleXSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>ScaleXSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<i>Socket</i><br>
+&nbsp;&nbsp;<nobr><A HREF="java.net.Socket.html#java.net.Socket.ctor_changed()" class="hiddenlink" target="rightframe">Socket
+()</A></nobr>&nbsp;constructor<br>
+&nbsp;&nbsp;<nobr><A HREF="java.net.Socket.html#java.net.Socket.ctor_changed(java.lang.String, int)" class="hiddenlink" target="rightframe">Socket
+(<code>String, int</code>)</A></nobr>&nbsp;constructor<br>
+&nbsp;&nbsp;<nobr><A HREF="java.net.Socket.html#java.net.Socket.ctor_changed(java.lang.String, int, java.net.InetAddress, int)" class="hiddenlink" target="rightframe">Socket
+(<code>String, int, InetAddress, int</code>)</A></nobr>&nbsp;constructor<br>
+&nbsp;&nbsp;<nobr><A HREF="java.net.Socket.html#java.net.Socket.ctor_changed(java.net.Proxy)" class="hiddenlink" target="rightframe">Socket
+(<code>Proxy</code>)</A></nobr>&nbsp;constructor<br>
+&nbsp;&nbsp;<nobr><A HREF="java.net.Socket.html#java.net.Socket.ctor_changed(java.net.SocketImpl)" class="hiddenlink" target="rightframe">Socket
+(<code>SocketImpl</code>)</A></nobr>&nbsp;constructor<br>
+<nobr><A HREF="android.text.style.StrikethroughSpan.html#android.text.style.StrikethroughSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>StrikethroughSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<i>String</i><br>
+&nbsp;&nbsp;<nobr><A HREF="java.lang.String.html#java.lang.String.ctor_changed()" class="hiddenlink" target="rightframe">String
+()</A></nobr>&nbsp;constructor<br>
+&nbsp;&nbsp;<nobr><A HREF="java.lang.String.html#java.lang.String.ctor_changed(byte[])" class="hiddenlink" target="rightframe">String
+(<code>byte[]</code>)</A></nobr>&nbsp;constructor<br>
+&nbsp;&nbsp;<nobr><A HREF="java.lang.String.html#java.lang.String.ctor_changed(byte[], int)" class="hiddenlink" target="rightframe">String
+(<code>byte[], int</code>)</A></nobr>&nbsp;constructor<br>
+&nbsp;&nbsp;<nobr><A HREF="java.lang.String.html#java.lang.String.ctor_changed(byte[], int, int)" class="hiddenlink" target="rightframe">String
+(<code>byte[], int, int</code>)</A></nobr>&nbsp;constructor<br>
+&nbsp;&nbsp;<nobr><A HREF="java.lang.String.html#java.lang.String.ctor_changed(byte[], int, int, int)" class="hiddenlink" target="rightframe">String
+(<code>byte[], int, int, int</code>)</A></nobr>&nbsp;constructor<br>
+<nobr><A HREF="android.text.style.StyleSpan.html#android.text.style.StyleSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>StyleSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<nobr><A HREF="android.text.style.SubscriptSpan.html#android.text.style.SubscriptSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>SubscriptSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<nobr><A HREF="android.text.style.SuperscriptSpan.html#android.text.style.SuperscriptSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>SuperscriptSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<A NAME="T"></A>
+<br><font size="+2">T</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<i>TestMethod</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.suitebuilder.TestMethod.html#android.test.suitebuilder.TestMethod.ctor_added(java.lang.String, java.lang.Class<? extends junit.framework.TestCase>)" class="hiddenlink" target="rightframe"><b>TestMethod</b>
+(<code>String, Class&lt;TestCase&gt;</code>)</A></nobr>&nbsp;constructor<br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.suitebuilder.TestMethod.html#android.test.suitebuilder.TestMethod.ctor_added(junit.framework.TestCase)" class="hiddenlink" target="rightframe"><b>TestMethod</b>
+(<code>TestCase</code>)</A></nobr>&nbsp;constructor<br>
+<nobr><A HREF="android.text.style.TextAppearanceSpan.html#android.text.style.TextAppearanceSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>TextAppearanceSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<nobr><A HREF="android.graphics.drawable.TransitionDrawable.html#android.graphics.drawable.TransitionDrawable.ctor_added(android.graphics.drawable.Drawable[])" class="hiddenlink" target="rightframe"><b>TransitionDrawable</b>
+(<code>Drawable[]</code>)</A></nobr>&nbsp;constructor<br>
+<nobr><A HREF="android.text.style.TypefaceSpan.html#android.text.style.TypefaceSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>TypefaceSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<A NAME="U"></A>
+<br><font size="+2">U</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.text.style.UnderlineSpan.html#android.text.style.UnderlineSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>UnderlineSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<nobr><A HREF="android.text.style.URLSpan.html#android.text.style.URLSpan.ctor_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>URLSpan</b>
+(<code>Parcel</code>)</A></nobr>&nbsp;constructor<br>
+<A NAME="V"></A>
+<br><font size="+2">V</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.ctor_changed()" class="hiddenlink" target="rightframe">ViewConfiguration
+()</A></nobr>&nbsp;constructor<br>
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/constructors_index_changes.html b/docs/html/sdk/api_diff/3/changes/constructors_index_changes.html
new file mode 100644
index 000000000000..8ea3eec7b034
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/constructors_index_changes.html
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+Constructor Changes Index
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY class="gc-documentation">
+<a NAME="topheader"></a>
+<table summary="Index for Constructors" width="100%" class="jdiffIndex" border="0" cellspacing="0" cellpadding="0" style="padding-bottom:0;margin-bottom:0;">
+  <tr>
+  <th class="indexHeader">
+    Filter the Index:
+  </th>
+  </tr>
+  <tr>
+  <td class="indexText" style="line-height:1.3em;padding-left:2em;">
+<a href="constructors_index_all.html" class="staysblack">All Constructors</a>
+  <br>
+<A HREF="constructors_index_removals.html" xclass="hiddenlink">Removals</A>
+  <br>
+<A HREF="constructors_index_additions.html"xclass="hiddenlink">Additions</A>
+  <br>
+<b>Changes</b>
+  </td>
+  </tr>
+</table>
+<div id="indexTableCaption">
+<font size="-2"><strong>Bold</strong>&nbsp;indicates&nbsp;New;&nbsp;<strike>Strike</strike>&nbsp;indicates&nbsp;deleted. Plain indicates changed.</font>
+</div>
+<A NAME="D"></A>
+<br><font size="+2">D</font>&nbsp;
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<i>Date</i><br>
+&nbsp;&nbsp;<nobr><A HREF="java.util.Date.html#java.util.Date.ctor_changed()" class="hiddenlink" target="rightframe">Date
+()</A></nobr>&nbsp;constructor<br>
+&nbsp;&nbsp;<nobr><A HREF="java.util.Date.html#java.util.Date.ctor_changed(int, int, int, int, int, int)" class="hiddenlink" target="rightframe">Date
+(<code>int, int, int, int, int, int</code>)</A></nobr>&nbsp;constructor<br>
+<A NAME="G"></A>
+<br><font size="+2">G</font>&nbsp;
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<i>GestureDetector</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.view.GestureDetector.html#android.view.GestureDetector.ctor_changed(android.view.GestureDetector.OnGestureListener)" class="hiddenlink" target="rightframe">GestureDetector
+(<code>OnGestureListener</code>)</A></nobr>&nbsp;constructor<br>
+&nbsp;&nbsp;<nobr><A HREF="android.view.GestureDetector.html#android.view.GestureDetector.ctor_changed(android.view.GestureDetector.OnGestureListener, android.os.Handler)" class="hiddenlink" target="rightframe">GestureDetector
+(<code>OnGestureListener, Handler</code>)</A></nobr>&nbsp;constructor<br>
+<A NAME="S"></A>
+<br><font size="+2">S</font>&nbsp;
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<i>Socket</i><br>
+&nbsp;&nbsp;<nobr><A HREF="java.net.Socket.html#java.net.Socket.ctor_changed()" class="hiddenlink" target="rightframe">Socket
+()</A></nobr>&nbsp;constructor<br>
+&nbsp;&nbsp;<nobr><A HREF="java.net.Socket.html#java.net.Socket.ctor_changed(java.lang.String, int)" class="hiddenlink" target="rightframe">Socket
+(<code>String, int</code>)</A></nobr>&nbsp;constructor<br>
+&nbsp;&nbsp;<nobr><A HREF="java.net.Socket.html#java.net.Socket.ctor_changed(java.lang.String, int, java.net.InetAddress, int)" class="hiddenlink" target="rightframe">Socket
+(<code>String, int, InetAddress, int</code>)</A></nobr>&nbsp;constructor<br>
+&nbsp;&nbsp;<nobr><A HREF="java.net.Socket.html#java.net.Socket.ctor_changed(java.net.Proxy)" class="hiddenlink" target="rightframe">Socket
+(<code>Proxy</code>)</A></nobr>&nbsp;constructor<br>
+&nbsp;&nbsp;<nobr><A HREF="java.net.Socket.html#java.net.Socket.ctor_changed(java.net.SocketImpl)" class="hiddenlink" target="rightframe">Socket
+(<code>SocketImpl</code>)</A></nobr>&nbsp;constructor<br>
+<i>String</i><br>
+&nbsp;&nbsp;<nobr><A HREF="java.lang.String.html#java.lang.String.ctor_changed()" class="hiddenlink" target="rightframe">String
+()</A></nobr>&nbsp;constructor<br>
+&nbsp;&nbsp;<nobr><A HREF="java.lang.String.html#java.lang.String.ctor_changed(byte[])" class="hiddenlink" target="rightframe">String
+(<code>byte[]</code>)</A></nobr>&nbsp;constructor<br>
+&nbsp;&nbsp;<nobr><A HREF="java.lang.String.html#java.lang.String.ctor_changed(byte[], int)" class="hiddenlink" target="rightframe">String
+(<code>byte[], int</code>)</A></nobr>&nbsp;constructor<br>
+&nbsp;&nbsp;<nobr><A HREF="java.lang.String.html#java.lang.String.ctor_changed(byte[], int, int)" class="hiddenlink" target="rightframe">String
+(<code>byte[], int, int</code>)</A></nobr>&nbsp;constructor<br>
+&nbsp;&nbsp;<nobr><A HREF="java.lang.String.html#java.lang.String.ctor_changed(byte[], int, int, int)" class="hiddenlink" target="rightframe">String
+(<code>byte[], int, int, int</code>)</A></nobr>&nbsp;constructor<br>
+<A NAME="V"></A>
+<br><font size="+2">V</font>&nbsp;
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.ctor_changed()" class="hiddenlink" target="rightframe">ViewConfiguration
+()</A></nobr>&nbsp;constructor<br>
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/constructors_index_removals.html b/docs/html/sdk/api_diff/3/changes/constructors_index_removals.html
new file mode 100644
index 000000000000..8e591c1e3fd5
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/constructors_index_removals.html
@@ -0,0 +1,68 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+Constructor Removals Index
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY class="gc-documentation">
+<a NAME="topheader"></a>
+<table summary="Index for Constructors" width="100%" class="jdiffIndex" border="0" cellspacing="0" cellpadding="0" style="padding-bottom:0;margin-bottom:0;">
+  <tr>
+  <th class="indexHeader">
+    Filter the Index:
+  </th>
+  </tr>
+  <tr>
+  <td class="indexText" style="line-height:1.3em;padding-left:2em;">
+<a href="constructors_index_all.html" class="staysblack">All Constructors</a>
+  <br>
+<b>Removals</b>
+  <br>
+<A HREF="constructors_index_additions.html"xclass="hiddenlink">Additions</A>
+  <br>
+<A HREF="constructors_index_changes.html"xclass="hiddenlink">Changes</A>
+  </td>
+  </tr>
+</table>
+<div id="indexTableCaption">
+<font size="-2"><strong>Bold</strong>&nbsp;indicates&nbsp;New;&nbsp;<strike>Strike</strike>&nbsp;indicates&nbsp;deleted. Plain indicates changed.</font>
+</div>
+<A NAME="N"></A>
+<br><font size="+2">N</font>&nbsp;
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.net.NetworkInfo.html#android.net.NetworkInfo.ctor_removed(int)" class="hiddenlink" target="rightframe"><strike>NetworkInfo</strike>
+(<code>int</code>)</A></nobr>&nbsp;constructor<br>
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/dalvik.system.DexFile.html b/docs/html/sdk/api_diff/3/changes/dalvik.system.DexFile.html
new file mode 100644
index 000000000000..ef3937c0a195
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/dalvik.system.DexFile.html
@@ -0,0 +1,123 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+dalvik.system.DexFile
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class dalvik.system.<A HREF="../../../../reference/dalvik/system/DexFile.html" target="_top"><font size="+3"><tt>DexFile</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="dalvik.system.DexFile.loadDex_added(java.lang.String, java.lang.String, int)"></A>
+  <nobr><code>DexFile</code>&nbsp;<A HREF="../../../../reference/dalvik/system/DexFile.html#loadDex(java.lang.String, java.lang.String, int)" target="_top"><xfont size="+1"><tt>loadDex</tt></font></A>(<code>String,</nobr> String<nobr>,</nobr> int<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/dalvik.system.VMDebug.html b/docs/html/sdk/api_diff/3/changes/dalvik.system.VMDebug.html
new file mode 100644
index 000000000000..c7ee90942566
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/dalvik.system.VMDebug.html
@@ -0,0 +1,130 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+dalvik.system.VMDebug
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class dalvik.system.<A HREF="../../../../reference/dalvik/system/VMDebug.html" target="_top"><font size="+3"><tt>VMDebug</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="dalvik.system.VMDebug.dumpHprofData_added(java.lang.String)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/dalvik/system/VMDebug.html#dumpHprofData(java.lang.String)" target="_top"><xfont size="+1"><tt>dumpHprofData</tt></font></A>(<code>String</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="dalvik.system.VMDebug.isDebuggingEnabled_added()"></A>
+  <nobr><code>boolean</code>&nbsp;<A HREF="../../../../reference/dalvik/system/VMDebug.html#isDebuggingEnabled()" target="_top"><xfont size="+1"><tt>isDebuggingEnabled</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/dalvik.system.Zygote.html b/docs/html/sdk/api_diff/3/changes/dalvik.system.Zygote.html
new file mode 100644
index 000000000000..d26e9e64abe2
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/dalvik.system.Zygote.html
@@ -0,0 +1,187 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+dalvik.system.Zygote
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class dalvik.system.<A HREF="../../../../reference/dalvik/system/Zygote.html" target="_top"><font size="+3"><tt>Zygote</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="dalvik.system.Zygote.forkAndSpecialize_added(int, int, int[], int, int[][])"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/dalvik/system/Zygote.html#forkAndSpecialize(int, int, int[], int, int[][])" target="_top"><xfont size="+1"><tt>forkAndSpecialize</tt></font></A>(<code>int,</nobr> int<nobr>,</nobr> int[]<nobr>,</nobr> int<nobr>,</nobr> int[][]<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="dalvik.system.Zygote.forkSystemServer_added(int, int, int[], int, int[][])"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/dalvik/system/Zygote.html#forkSystemServer(int, int, int[], int, int[][])" target="_top"><xfont size="+1"><tt>forkSystemServer</tt></font></A>(<code>int,</nobr> int<nobr>,</nobr> int[]<nobr>,</nobr> int<nobr>,</nobr> int[][]<nobr><nobr></code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=3>Changed Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="dalvik.system.Zygote.forkAndSpecialize_changed(int, int, int[], boolean, int[][])"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/dalvik/system/Zygote.html#forkAndSpecialize(int, int, int[], boolean, int[][])" target="_top"><xfont size="+1"><tt>forkAndSpecialize</tt></font></A>(<code>int,</nobr> int<nobr>,</nobr> int[]<nobr>,</nobr> boolean<nobr>,</nobr> int[][]<nobr><nobr></code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="dalvik.system.Zygote.forkSystemServer_changed(int, int, int[], boolean, int[][])"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/dalvik/system/Zygote.html#forkSystemServer(int, int, int[], boolean, int[][])" target="_top"><xfont size="+1"><tt>forkSystemServer</tt></font></A>(<code>int,</nobr> int<nobr>,</nobr> int[]<nobr>,</nobr> boolean<nobr>,</nobr> int[][]<nobr><nobr></code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+<b>Now deprecated</b>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Fields" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="dalvik.system.Zygote.DEBUG_ENABLE_ASSERT"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/dalvik/system/Zygote.html#DEBUG_ENABLE_ASSERT" target="_top"><xfont size="+1"><tt>DEBUG_ENABLE_ASSERT</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="dalvik.system.Zygote.DEBUG_ENABLE_CHECKJNI"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/dalvik/system/Zygote.html#DEBUG_ENABLE_CHECKJNI" target="_top"><xfont size="+1"><tt>DEBUG_ENABLE_CHECKJNI</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="dalvik.system.Zygote.DEBUG_ENABLE_DEBUGGER"></A>
+  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/dalvik/system/Zygote.html#DEBUG_ENABLE_DEBUGGER" target="_top"><xfont size="+1"><tt>DEBUG_ENABLE_DEBUGGER</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/fields_index_additions.html b/docs/html/sdk/api_diff/3/changes/fields_index_additions.html
new file mode 100644
index 000000000000..c2c3b494595c
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/fields_index_additions.html
@@ -0,0 +1,1129 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+Field Additions Index
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY class="gc-documentation">
+<a NAME="topheader"></a>
+<table summary="Index for Fields" width="100%" class="jdiffIndex" border="0" cellspacing="0" cellpadding="0" style="padding-bottom:0;margin-bottom:0;">
+  <tr>
+  <th class="indexHeader">
+    Filter the Index:
+  </th>
+  </tr>
+  <tr>
+  <td class="indexText" style="line-height:1.3em;padding-left:2em;">
+<a href="fields_index_all.html" class="staysblack">All Fields</a>
+  <br>
+<A HREF="fields_index_removals.html" xclass="hiddenlink">Removals</A>
+  <br>
+<b>Additions</b>
+  <br>
+<A HREF="fields_index_changes.html"xclass="hiddenlink">Changes</A>
+  </td>
+  </tr>
+</table>
+<div id="indexTableCaption">
+<font size="-2"><strong>Bold</strong>&nbsp;indicates&nbsp;New;&nbsp;<strike>Strike</strike>&nbsp;indicates&nbsp;deleted. Plain indicates changed.</font>
+</div>
+<A NAME="A"></A>
+<br><font size="+2">A</font>&nbsp;
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.ACCELEROMETER_ROTATION" class="hiddenlink" target="rightframe">ACCELEROMETER_ROTATION</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.html#android.provider.Settings.ACTION_AIRPLANE_MODE_SETTINGS" class="hiddenlink" target="rightframe">ACTION_AIRPLANE_MODE_SETTINGS</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.html#android.provider.Settings.ACTION_APPLICATION_DEVELOPMENT_SETTINGS" class="hiddenlink" target="rightframe">ACTION_APPLICATION_DEVELOPMENT_SETTINGS</A>
+</nobr><br>
+<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.ACTION_AUDIO_BECOMING_NOISY" class="hiddenlink" target="rightframe">ACTION_AUDIO_BECOMING_NOISY</A>
+</nobr><br>
+<nobr><A HREF="android.net.ConnectivityManager.html#android.net.ConnectivityManager.ACTION_BACKGROUND_DATA_SETTING_CHANGED" class="hiddenlink" target="rightframe">ACTION_BACKGROUND_DATA_SETTING_CHANGED</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.html#android.provider.Settings.ACTION_DATA_ROAMING_SETTINGS" class="hiddenlink" target="rightframe">ACTION_DATA_ROAMING_SETTINGS</A>
+</nobr><br>
+<nobr><A HREF="android.provider.MediaStore.html#android.provider.MediaStore.ACTION_IMAGE_CAPTURE" class="hiddenlink" target="rightframe">ACTION_IMAGE_CAPTURE</A>
+</nobr><br>
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.ACTION_INPUT_METHOD_CHANGED" class="hiddenlink" target="rightframe">ACTION_INPUT_METHOD_CHANGED</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.html#android.provider.Settings.ACTION_INPUT_METHOD_SETTINGS" class="hiddenlink" target="rightframe">ACTION_INPUT_METHOD_SETTINGS</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.html#android.provider.Settings.ACTION_INTERNAL_STORAGE_SETTINGS" class="hiddenlink" target="rightframe">ACTION_INTERNAL_STORAGE_SETTINGS</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.html#android.provider.Settings.ACTION_MANAGE_APPLICATIONS_SETTINGS" class="hiddenlink" target="rightframe">ACTION_MANAGE_APPLICATIONS_SETTINGS</A>
+</nobr><br>
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.ACTION_MEDIA_CHECKING" class="hiddenlink" target="rightframe">ACTION_MEDIA_CHECKING</A>
+</nobr><br>
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.ACTION_MEDIA_NOFS" class="hiddenlink" target="rightframe">ACTION_MEDIA_NOFS</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.html#android.provider.Settings.ACTION_MEMORY_CARD_SETTINGS" class="hiddenlink" target="rightframe">ACTION_MEMORY_CARD_SETTINGS</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.html#android.provider.Settings.ACTION_NETWORK_OPERATOR_SETTINGS" class="hiddenlink" target="rightframe">ACTION_NETWORK_OPERATOR_SETTINGS</A>
+</nobr><br>
+<nobr><A HREF="android.view.MotionEvent.html#android.view.MotionEvent.ACTION_OUTSIDE" class="hiddenlink" target="rightframe">ACTION_OUTSIDE</A>
+</nobr><br>
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.ACTION_PACKAGE_DATA_CLEARED" class="hiddenlink" target="rightframe">ACTION_PACKAGE_DATA_CLEARED</A>
+</nobr><br>
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.ACTION_PACKAGE_REPLACED" class="hiddenlink" target="rightframe">ACTION_PACKAGE_REPLACED</A>
+</nobr><br>
+<nobr><A HREF="android.telephony.TelephonyManager.html#android.telephony.TelephonyManager.ACTION_PHONE_STATE_CHANGED" class="hiddenlink" target="rightframe">ACTION_PHONE_STATE_CHANGED</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.html#android.provider.Settings.ACTION_QUICK_LAUNCH_SETTINGS" class="hiddenlink" target="rightframe">ACTION_QUICK_LAUNCH_SETTINGS</A>
+</nobr><br>
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.ACTION_SEARCH_LONG_PRESS" class="hiddenlink" target="rightframe">ACTION_SEARCH_LONG_PRESS</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.html#android.provider.Settings.ACTION_SYNC_SETTINGS" class="hiddenlink" target="rightframe">ACTION_SYNC_SETTINGS</A>
+</nobr><br>
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.ACTION_SYSTEM_TUTORIAL" class="hiddenlink" target="rightframe">ACTION_SYSTEM_TUTORIAL</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.html#android.provider.Settings.ACTION_USER_DICTIONARY_SETTINGS" class="hiddenlink" target="rightframe">ACTION_USER_DICTIONARY_SETTINGS</A>
+</nobr><br>
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.ACTION_USER_PRESENT" class="hiddenlink" target="rightframe">ACTION_USER_PRESENT</A>
+</nobr><br>
+<nobr><A HREF="android.provider.MediaStore.html#android.provider.MediaStore.ACTION_VIDEO_CAPTURE" class="hiddenlink" target="rightframe">ACTION_VIDEO_CAPTURE</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.html#android.provider.Settings.ACTION_WIFI_IP_SETTINGS" class="hiddenlink" target="rightframe">ACTION_WIFI_IP_SETTINGS</A>
+</nobr><br>
+<nobr><A HREF="android.R.id.html#android.R.id.addToDictionary" class="hiddenlink" target="rightframe">addToDictionary</A>
+</nobr><br>
+<nobr><A HREF="android.text.style.DynamicDrawableSpan.html#android.text.style.DynamicDrawableSpan.ALIGN_BASELINE" class="hiddenlink" target="rightframe">ALIGN_BASELINE</A>
+</nobr><br>
+<nobr><A HREF="android.text.style.DynamicDrawableSpan.html#android.text.style.DynamicDrawableSpan.ALIGN_BOTTOM" class="hiddenlink" target="rightframe">ALIGN_BOTTOM</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.allowSingleTap" class="hiddenlink" target="rightframe">allowSingleTap</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.animateOnClick" class="hiddenlink" target="rightframe">animateOnClick</A>
+</nobr><br>
+<nobr><A HREF="android.view.Gravity.html#android.view.Gravity.AXIS_CLIP" class="hiddenlink" target="rightframe">AXIS_CLIP</A>
+</nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.AXIS_MINUS_X" class="hiddenlink" target="rightframe">AXIS_MINUS_X</A>
+</nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.AXIS_MINUS_Y" class="hiddenlink" target="rightframe">AXIS_MINUS_Y</A>
+</nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.AXIS_MINUS_Z" class="hiddenlink" target="rightframe">AXIS_MINUS_Z</A>
+</nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.AXIS_X" class="hiddenlink" target="rightframe">AXIS_X</A>
+</nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.AXIS_Y" class="hiddenlink" target="rightframe">AXIS_Y</A>
+</nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.AXIS_Z" class="hiddenlink" target="rightframe">AXIS_Z</A>
+</nobr><br>
+<A NAME="B"></A>
+<br><font size="+2">B</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.R.attr.html#android.R.attr.backgroundDimEnabled" class="hiddenlink" target="rightframe">backgroundDimEnabled</A>
+</nobr><br>
+<nobr><A HREF="android.Manifest.permission.html#android.Manifest.permission.BIND_APPWIDGET" class="hiddenlink" target="rightframe">BIND_APPWIDGET</A>
+</nobr><br>
+<nobr><A HREF="android.Manifest.permission.html#android.Manifest.permission.BIND_INPUT_METHOD" class="hiddenlink" target="rightframe">BIND_INPUT_METHOD</A>
+</nobr><br>
+<nobr><A HREF="android.provider.MediaStore.Video.VideoColumns.html#android.provider.MediaStore.Video.VideoColumns.BOOKMARK" class="hiddenlink" target="rightframe">BOOKMARK</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.bottomOffset" class="hiddenlink" target="rightframe">bottomOffset</A>
+</nobr><br>
+<nobr><A HREF="android.provider.MediaStore.Video.VideoColumns.html#android.provider.MediaStore.Video.VideoColumns.BUCKET_DISPLAY_NAME" class="hiddenlink" target="rightframe">BUCKET_DISPLAY_NAME</A>
+</nobr><br>
+<nobr><A HREF="android.provider.MediaStore.Video.VideoColumns.html#android.provider.MediaStore.Video.VideoColumns.BUCKET_ID" class="hiddenlink" target="rightframe">BUCKET_ID</A>
+</nobr><br>
+<nobr><A HREF="android.content.DialogInterface.html#android.content.DialogInterface.BUTTON_NEGATIVE" class="hiddenlink" target="rightframe">BUTTON_NEGATIVE</A>
+</nobr><br>
+<nobr><A HREF="android.content.DialogInterface.html#android.content.DialogInterface.BUTTON_NEUTRAL" class="hiddenlink" target="rightframe">BUTTON_NEUTRAL</A>
+</nobr><br>
+<nobr><A HREF="android.content.DialogInterface.html#android.content.DialogInterface.BUTTON_POSITIVE" class="hiddenlink" target="rightframe">BUTTON_POSITIVE</A>
+</nobr><br>
+<A NAME="C"></A>
+<br><font size="+2">C</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.R.id.html#android.R.id.candidatesArea" class="hiddenlink" target="rightframe">candidatesArea</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.candidatesTextStyleSpans" class="hiddenlink" target="rightframe">candidatesTextStyleSpans</A>
+</nobr><br>
+<nobr><A HREF="android.text.TextUtils.html#android.text.TextUtils.CAP_MODE_CHARACTERS" class="hiddenlink" target="rightframe">CAP_MODE_CHARACTERS</A>
+</nobr><br>
+<nobr><A HREF="android.text.TextUtils.html#android.text.TextUtils.CAP_MODE_SENTENCES" class="hiddenlink" target="rightframe">CAP_MODE_SENTENCES</A>
+</nobr><br>
+<nobr><A HREF="android.text.TextUtils.html#android.text.TextUtils.CAP_MODE_WORDS" class="hiddenlink" target="rightframe">CAP_MODE_WORDS</A>
+</nobr><br>
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.CATEGORY_INFO" class="hiddenlink" target="rightframe">CATEGORY_INFO</A>
+</nobr><br>
+<nobr><A HREF="android.view.Gravity.html#android.view.Gravity.CLIP_HORIZONTAL" class="hiddenlink" target="rightframe">CLIP_HORIZONTAL</A>
+</nobr><br>
+<nobr><A HREF="android.view.Gravity.html#android.view.Gravity.CLIP_VERTICAL" class="hiddenlink" target="rightframe">CLIP_VERTICAL</A>
+</nobr><br>
+<nobr><A HREF="android.R.id.html#android.R.id.closeButton" class="hiddenlink" target="rightframe">closeButton</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.codes" class="hiddenlink" target="rightframe">codes</A>
+</nobr><br>
+<nobr><A HREF="android.content.pm.PackageInfo.html#android.content.pm.PackageInfo.configPreferences" class="hiddenlink" target="rightframe">configPreferences</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.configure" class="hiddenlink" target="rightframe">configure</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.content" class="hiddenlink" target="rightframe">content</A>
+</nobr><br>
+<nobr><A HREF="android.R.id.html#android.R.id.copy" class="hiddenlink" target="rightframe">copy</A>
+</nobr><br>
+<nobr><A HREF="android.R.id.html#android.R.id.copyUrl" class="hiddenlink" target="rightframe">copyUrl</A>
+</nobr><br>
+<i>CREATOR</i><br>
+&nbsp;in&nbsp;
+<nobr><A HREF="android.content.res.AssetFileDescriptor.html#android.content.res.AssetFileDescriptor.CREATOR" class="hiddenlink" target="rightframe">android.content.res.AssetFileDescriptor</A>
+</nobr><br>
+&nbsp;in&nbsp;
+<nobr><A HREF="android.graphics.RectF.html#android.graphics.RectF.CREATOR" class="hiddenlink" target="rightframe">android.graphics.RectF</A>
+</nobr><br>
+<nobr><A HREF="android.R.id.html#android.R.id.cut" class="hiddenlink" target="rightframe">cut</A>
+</nobr><br>
+<A NAME="D"></A>
+<br><font size="+2">D</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.R.drawable.html#android.R.drawable.dark_header" class="hiddenlink" target="rightframe">dark_header</A>
+</nobr><br>
+<nobr><A HREF="dalvik.system.Zygote.html#dalvik.system.Zygote.DEBUG_ENABLE_ASSERT" class="hiddenlink" target="rightframe">DEBUG_ENABLE_ASSERT</A>
+</nobr><br>
+<nobr><A HREF="dalvik.system.Zygote.html#dalvik.system.Zygote.DEBUG_ENABLE_CHECKJNI" class="hiddenlink" target="rightframe">DEBUG_ENABLE_CHECKJNI</A>
+</nobr><br>
+<nobr><A HREF="dalvik.system.Zygote.html#dalvik.system.Zygote.DEBUG_ENABLE_DEBUGGER" class="hiddenlink" target="rightframe">DEBUG_ENABLE_DEBUGGER</A>
+</nobr><br>
+<nobr><A HREF="android.R.string.html#android.R.string.dialog_alert_title" class="hiddenlink" target="rightframe">dialog_alert_title</A>
+</nobr><br>
+<nobr><A HREF="android.os.Build.html#android.os.Build.DISPLAY" class="hiddenlink" target="rightframe">DISPLAY</A>
+</nobr><br>
+<nobr><A HREF="android.view.Gravity.html#android.view.Gravity.DISPLAY_CLIP_HORIZONTAL" class="hiddenlink" target="rightframe">DISPLAY_CLIP_HORIZONTAL</A>
+</nobr><br>
+<nobr><A HREF="android.view.Gravity.html#android.view.Gravity.DISPLAY_CLIP_VERTICAL" class="hiddenlink" target="rightframe">DISPLAY_CLIP_VERTICAL</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.dropDownAnchor" class="hiddenlink" target="rightframe">dropDownAnchor</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.dropDownWidth" class="hiddenlink" target="rightframe">dropDownWidth</A>
+</nobr><br>
+<A NAME="E"></A>
+<br><font size="+2">E</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.R.attr.html#android.R.attr.editorExtras" class="hiddenlink" target="rightframe">editorExtras</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Browser.html#android.provider.Browser.EXTRA_APPLICATION_ID" class="hiddenlink" target="rightframe">EXTRA_APPLICATION_ID</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Contacts.Intents.html#android.provider.Contacts.Intents.EXTRA_CREATE_DESCRIPTION" class="hiddenlink" target="rightframe">EXTRA_CREATE_DESCRIPTION</A>
+</nobr><br>
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.EXTRA_DATA_REMOVED" class="hiddenlink" target="rightframe">EXTRA_DATA_REMOVED</A>
+</nobr><br>
+<nobr><A HREF="android.provider.MediaStore.html#android.provider.MediaStore.EXTRA_FINISH_ON_COMPLETION" class="hiddenlink" target="rightframe">EXTRA_FINISH_ON_COMPLETION</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Contacts.Intents.html#android.provider.Contacts.Intents.EXTRA_FORCE_CREATE" class="hiddenlink" target="rightframe">EXTRA_FORCE_CREATE</A>
+</nobr><br>
+<nobr><A HREF="android.telephony.TelephonyManager.html#android.telephony.TelephonyManager.EXTRA_INCOMING_NUMBER" class="hiddenlink" target="rightframe">EXTRA_INCOMING_NUMBER</A>
+</nobr><br>
+<nobr><A HREF="android.provider.MediaStore.Audio.Media.html#android.provider.MediaStore.Audio.Media.EXTRA_MAX_BYTES" class="hiddenlink" target="rightframe">EXTRA_MAX_BYTES</A>
+</nobr><br>
+<nobr><A HREF="android.provider.MediaStore.html#android.provider.MediaStore.EXTRA_MEDIA_ALBUM" class="hiddenlink" target="rightframe">EXTRA_MEDIA_ALBUM</A>
+</nobr><br>
+<nobr><A HREF="android.provider.MediaStore.html#android.provider.MediaStore.EXTRA_MEDIA_ARTIST" class="hiddenlink" target="rightframe">EXTRA_MEDIA_ARTIST</A>
+</nobr><br>
+<nobr><A HREF="android.provider.MediaStore.html#android.provider.MediaStore.EXTRA_MEDIA_FOCUS" class="hiddenlink" target="rightframe">EXTRA_MEDIA_FOCUS</A>
+</nobr><br>
+<nobr><A HREF="android.provider.MediaStore.html#android.provider.MediaStore.EXTRA_MEDIA_TITLE" class="hiddenlink" target="rightframe">EXTRA_MEDIA_TITLE</A>
+</nobr><br>
+<nobr><A HREF="android.provider.MediaStore.html#android.provider.MediaStore.EXTRA_OUTPUT" class="hiddenlink" target="rightframe">EXTRA_OUTPUT</A>
+</nobr><br>
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.EXTRA_REPLACING" class="hiddenlink" target="rightframe">EXTRA_REPLACING</A>
+</nobr><br>
+<nobr><A HREF="android.provider.MediaStore.html#android.provider.MediaStore.EXTRA_SCREEN_ORIENTATION" class="hiddenlink" target="rightframe">EXTRA_SCREEN_ORIENTATION</A>
+</nobr><br>
+<nobr><A HREF="android.telephony.TelephonyManager.html#android.telephony.TelephonyManager.EXTRA_STATE" class="hiddenlink" target="rightframe">EXTRA_STATE</A>
+</nobr><br>
+<nobr><A HREF="android.telephony.TelephonyManager.html#android.telephony.TelephonyManager.EXTRA_STATE_IDLE" class="hiddenlink" target="rightframe">EXTRA_STATE_IDLE</A>
+</nobr><br>
+<nobr><A HREF="android.telephony.TelephonyManager.html#android.telephony.TelephonyManager.EXTRA_STATE_OFFHOOK" class="hiddenlink" target="rightframe">EXTRA_STATE_OFFHOOK</A>
+</nobr><br>
+<nobr><A HREF="android.telephony.TelephonyManager.html#android.telephony.TelephonyManager.EXTRA_STATE_RINGING" class="hiddenlink" target="rightframe">EXTRA_STATE_RINGING</A>
+</nobr><br>
+<nobr><A HREF="android.provider.MediaStore.html#android.provider.MediaStore.EXTRA_VIDEO_QUALITY" class="hiddenlink" target="rightframe">EXTRA_VIDEO_QUALITY</A>
+</nobr><br>
+<nobr><A HREF="android.R.id.html#android.R.id.extractArea" class="hiddenlink" target="rightframe">extractArea</A>
+</nobr><br>
+<A NAME="F"></A>
+<br><font size="+2">F</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.R.attr.html#android.R.attr.fastScrollEnabled" class="hiddenlink" target="rightframe">fastScrollEnabled</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.fillEnabled" class="hiddenlink" target="rightframe">fillEnabled</A>
+</nobr><br>
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET" class="hiddenlink" target="rightframe">FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET</A>
+</nobr><br>
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.FLAG_ACTIVITY_NO_USER_ACTION" class="hiddenlink" target="rightframe">FLAG_ACTIVITY_NO_USER_ACTION</A>
+</nobr><br>
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.FLAG_ACTIVITY_REORDER_TO_FRONT" class="hiddenlink" target="rightframe">FLAG_ACTIVITY_REORDER_TO_FRONT</A>
+</nobr><br>
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM" class="hiddenlink" target="rightframe">FLAG_ALT_FOCUSABLE_IM</A>
+</nobr><br>
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.FLAG_EDITOR_ACTION" class="hiddenlink" target="rightframe">FLAG_EDITOR_ACTION</A>
+</nobr><br>
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.FLAG_FROM_SYSTEM" class="hiddenlink" target="rightframe">FLAG_FROM_SYSTEM</A>
+</nobr><br>
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.FLAG_KEEP_TOUCH_MODE" class="hiddenlink" target="rightframe">FLAG_KEEP_TOUCH_MODE</A>
+</nobr><br>
+<nobr><A HREF="android.content.pm.ActivityInfo.html#android.content.pm.ActivityInfo.FLAG_NO_HISTORY" class="hiddenlink" target="rightframe">FLAG_NO_HISTORY</A>
+</nobr><br>
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.FLAG_SOFT_KEYBOARD" class="hiddenlink" target="rightframe">FLAG_SOFT_KEYBOARD</A>
+</nobr><br>
+<nobr><A HREF="android.app.PendingIntent.html#android.app.PendingIntent.FLAG_UPDATE_CURRENT" class="hiddenlink" target="rightframe">FLAG_UPDATE_CURRENT</A>
+</nobr><br>
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH" class="hiddenlink" target="rightframe">FLAG_WATCH_OUTSIDE_TOUCH</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.footerDividersEnabled" class="hiddenlink" target="rightframe">footerDividersEnabled</A>
+</nobr><br>
+<nobr><A HREF="android.telephony.PhoneNumberUtils.html#android.telephony.PhoneNumberUtils.FORMAT_JAPAN" class="hiddenlink" target="rightframe">FORMAT_JAPAN</A>
+</nobr><br>
+<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.FX_KEYPRESS_DELETE" class="hiddenlink" target="rightframe">FX_KEYPRESS_DELETE</A>
+</nobr><br>
+<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.FX_KEYPRESS_RETURN" class="hiddenlink" target="rightframe">FX_KEYPRESS_RETURN</A>
+</nobr><br>
+<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.FX_KEYPRESS_SPACEBAR" class="hiddenlink" target="rightframe">FX_KEYPRESS_SPACEBAR</A>
+</nobr><br>
+<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.FX_KEYPRESS_STANDARD" class="hiddenlink" target="rightframe">FX_KEYPRESS_STANDARD</A>
+</nobr><br>
+<A NAME="G"></A>
+<br><font size="+2">G</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.content.pm.PackageManager.html#android.content.pm.PackageManager.GET_CONFIGURATIONS" class="hiddenlink" target="rightframe">GET_CONFIGURATIONS</A>
+</nobr><br>
+<nobr><A HREF="android.content.pm.PackageManager.html#android.content.pm.PackageManager.GET_UNINSTALLED_PACKAGES" class="hiddenlink" target="rightframe">GET_UNINSTALLED_PACKAGES</A>
+</nobr><br>
+<A NAME="H"></A>
+<br><font size="+2">H</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.R.attr.html#android.R.attr.handle" class="hiddenlink" target="rightframe">handle</A>
+</nobr><br>
+<i>HAPTIC_FEEDBACK_ENABLED</i><br>
+&nbsp;in&nbsp;
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.HAPTIC_FEEDBACK_ENABLED" class="hiddenlink" target="rightframe">android.provider.Settings.System</A>
+</nobr><br>
+&nbsp;in&nbsp;
+<nobr><A HREF="android.view.View.html#android.view.View.HAPTIC_FEEDBACK_ENABLED" class="hiddenlink" target="rightframe">android.view.View</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.hapticFeedbackEnabled" class="hiddenlink" target="rightframe">hapticFeedbackEnabled</A>
+</nobr><br>
+<nobr><A HREF="android.content.res.Configuration.html#android.content.res.Configuration.hardKeyboardHidden" class="hiddenlink" target="rightframe">hardKeyboardHidden</A>
+</nobr><br>
+<nobr><A HREF="android.content.res.Configuration.html#android.content.res.Configuration.HARDKEYBOARDHIDDEN_NO" class="hiddenlink" target="rightframe">HARDKEYBOARDHIDDEN_NO</A>
+</nobr><br>
+<nobr><A HREF="android.content.res.Configuration.html#android.content.res.Configuration.HARDKEYBOARDHIDDEN_UNDEFINED" class="hiddenlink" target="rightframe">HARDKEYBOARDHIDDEN_UNDEFINED</A>
+</nobr><br>
+<nobr><A HREF="android.content.res.Configuration.html#android.content.res.Configuration.HARDKEYBOARDHIDDEN_YES" class="hiddenlink" target="rightframe">HARDKEYBOARDHIDDEN_YES</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.headerDividersEnabled" class="hiddenlink" target="rightframe">headerDividersEnabled</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.horizontalGap" class="hiddenlink" target="rightframe">horizontalGap</A>
+</nobr><br>
+<A NAME="I"></A>
+<br><font size="+2">I</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.R.drawable.html#android.R.drawable.ic_btn_speak_now" class="hiddenlink" target="rightframe">ic_btn_speak_now</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.iconPreview" class="hiddenlink" target="rightframe">iconPreview</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.imeActionId" class="hiddenlink" target="rightframe">imeActionId</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.imeActionLabel" class="hiddenlink" target="rightframe">imeActionLabel</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.imeExtractEnterAnimation" class="hiddenlink" target="rightframe">imeExtractEnterAnimation</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.imeExtractExitAnimation" class="hiddenlink" target="rightframe">imeExtractExitAnimation</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.imeFullscreenBackground" class="hiddenlink" target="rightframe">imeFullscreenBackground</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.imeOptions" class="hiddenlink" target="rightframe">imeOptions</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.initialLayout" class="hiddenlink" target="rightframe">initialLayout</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.innerRadius" class="hiddenlink" target="rightframe">innerRadius</A>
+</nobr><br>
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.INPUT_METHOD_FROM_FOCUSABLE" class="hiddenlink" target="rightframe">INPUT_METHOD_FROM_FOCUSABLE</A>
+</nobr><br>
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.INPUT_METHOD_NEEDED" class="hiddenlink" target="rightframe">INPUT_METHOD_NEEDED</A>
+</nobr><br>
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.INPUT_METHOD_NOT_NEEDED" class="hiddenlink" target="rightframe">INPUT_METHOD_NOT_NEEDED</A>
+</nobr><br>
+<nobr><A HREF="android.content.Context.html#android.content.Context.INPUT_METHOD_SERVICE" class="hiddenlink" target="rightframe">INPUT_METHOD_SERVICE</A>
+</nobr><br>
+<nobr><A HREF="android.R.id.html#android.R.id.inputArea" class="hiddenlink" target="rightframe">inputArea</A>
+</nobr><br>
+<nobr><A HREF="android.R.id.html#android.R.id.inputExtractEditText" class="hiddenlink" target="rightframe">inputExtractEditText</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.inputType" class="hiddenlink" target="rightframe">inputType</A>
+</nobr><br>
+<nobr><A HREF="android.content.pm.PackageManager.html#android.content.pm.PackageManager.INSTALL_FAILED_CONFLICTING_PROVIDER" class="hiddenlink" target="rightframe">INSTALL_FAILED_CONFLICTING_PROVIDER</A>
+</nobr><br>
+<nobr><A HREF="android.provider.MediaStore.html#android.provider.MediaStore.INTENT_ACTION_MEDIA_SEARCH" class="hiddenlink" target="rightframe">INTENT_ACTION_MEDIA_SEARCH</A>
+</nobr><br>
+<nobr><A HREF="android.provider.MediaStore.html#android.provider.MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA" class="hiddenlink" target="rightframe">INTENT_ACTION_STILL_IMAGE_CAMERA</A>
+</nobr><br>
+<nobr><A HREF="android.provider.MediaStore.html#android.provider.MediaStore.INTENT_ACTION_VIDEO_CAMERA" class="hiddenlink" target="rightframe">INTENT_ACTION_VIDEO_CAMERA</A>
+</nobr><br>
+<nobr><A HREF="android.app.AlarmManager.html#android.app.AlarmManager.INTERVAL_DAY" class="hiddenlink" target="rightframe">INTERVAL_DAY</A>
+</nobr><br>
+<nobr><A HREF="android.app.AlarmManager.html#android.app.AlarmManager.INTERVAL_FIFTEEN_MINUTES" class="hiddenlink" target="rightframe">INTERVAL_FIFTEEN_MINUTES</A>
+</nobr><br>
+<nobr><A HREF="android.app.AlarmManager.html#android.app.AlarmManager.INTERVAL_HALF_DAY" class="hiddenlink" target="rightframe">INTERVAL_HALF_DAY</A>
+</nobr><br>
+<nobr><A HREF="android.app.AlarmManager.html#android.app.AlarmManager.INTERVAL_HALF_HOUR" class="hiddenlink" target="rightframe">INTERVAL_HALF_HOUR</A>
+</nobr><br>
+<nobr><A HREF="android.app.AlarmManager.html#android.app.AlarmManager.INTERVAL_HOUR" class="hiddenlink" target="rightframe">INTERVAL_HOUR</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.isDefault" class="hiddenlink" target="rightframe">isDefault</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.isModifier" class="hiddenlink" target="rightframe">isModifier</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.isRepeatable" class="hiddenlink" target="rightframe">isRepeatable</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.isScrollContainer" class="hiddenlink" target="rightframe">isScrollContainer</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.isSticky" class="hiddenlink" target="rightframe">isSticky</A>
+</nobr><br>
+<A NAME="K"></A>
+<br><font size="+2">K</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.KEY_LOCATION_CHANGED" class="hiddenlink" target="rightframe">KEY_LOCATION_CHANGED</A>
+</nobr><br>
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.KEY_PROVIDER_ENABLED" class="hiddenlink" target="rightframe">KEY_PROVIDER_ENABLED</A>
+</nobr><br>
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.KEY_STATUS_CHANGED" class="hiddenlink" target="rightframe">KEY_STATUS_CHANGED</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.keyBackground" class="hiddenlink" target="rightframe">keyBackground</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.keyboardMode" class="hiddenlink" target="rightframe">keyboardMode</A>
+</nobr><br>
+<nobr><A HREF="android.R.id.html#android.R.id.keyboardView" class="hiddenlink" target="rightframe">keyboardView</A>
+</nobr><br>
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.KEYCODE_MEDIA_FAST_FORWARD" class="hiddenlink" target="rightframe">KEYCODE_MEDIA_FAST_FORWARD</A>
+</nobr><br>
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.KEYCODE_MEDIA_NEXT" class="hiddenlink" target="rightframe">KEYCODE_MEDIA_NEXT</A>
+</nobr><br>
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE" class="hiddenlink" target="rightframe">KEYCODE_MEDIA_PLAY_PAUSE</A>
+</nobr><br>
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.KEYCODE_MEDIA_PREVIOUS" class="hiddenlink" target="rightframe">KEYCODE_MEDIA_PREVIOUS</A>
+</nobr><br>
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.KEYCODE_MEDIA_REWIND" class="hiddenlink" target="rightframe">KEYCODE_MEDIA_REWIND</A>
+</nobr><br>
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.KEYCODE_MEDIA_STOP" class="hiddenlink" target="rightframe">KEYCODE_MEDIA_STOP</A>
+</nobr><br>
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.KEYCODE_MUTE" class="hiddenlink" target="rightframe">KEYCODE_MUTE</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.keyEdgeFlags" class="hiddenlink" target="rightframe">keyEdgeFlags</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.keyHeight" class="hiddenlink" target="rightframe">keyHeight</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.keyIcon" class="hiddenlink" target="rightframe">keyIcon</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.keyLabel" class="hiddenlink" target="rightframe">keyLabel</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.keyOutputText" class="hiddenlink" target="rightframe">keyOutputText</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.keyPreviewHeight" class="hiddenlink" target="rightframe">keyPreviewHeight</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.keyPreviewLayout" class="hiddenlink" target="rightframe">keyPreviewLayout</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.keyPreviewOffset" class="hiddenlink" target="rightframe">keyPreviewOffset</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.keyTextColor" class="hiddenlink" target="rightframe">keyTextColor</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.keyTextSize" class="hiddenlink" target="rightframe">keyTextSize</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.keyWidth" class="hiddenlink" target="rightframe">keyWidth</A>
+</nobr><br>
+<A NAME="L"></A>
+<br><font size="+2">L</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.R.attr.html#android.R.attr.labelTextSize" class="hiddenlink" target="rightframe">labelTextSize</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.LOCK_PATTERN_TACTILE_FEEDBACK_ENABLED" class="hiddenlink" target="rightframe">LOCK_PATTERN_TACTILE_FEEDBACK_ENABLED</A>
+</nobr><br>
+<A NAME="M"></A>
+<br><font size="+2">M</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.os.Environment.html#android.os.Environment.MEDIA_CHECKING" class="hiddenlink" target="rightframe">MEDIA_CHECKING</A>
+</nobr><br>
+<nobr><A HREF="android.media.MediaPlayer.html#android.media.MediaPlayer.MEDIA_ERROR_NOT_VALID_FOR_PROGRESSIVE_PLAYBACK" class="hiddenlink" target="rightframe">MEDIA_ERROR_NOT_VALID_FOR_PROGRESSIVE_PLAYBACK</A>
+</nobr><br>
+<nobr><A HREF="android.media.MediaPlayer.html#android.media.MediaPlayer.MEDIA_INFO_BAD_INTERLEAVING" class="hiddenlink" target="rightframe">MEDIA_INFO_BAD_INTERLEAVING</A>
+</nobr><br>
+<nobr><A HREF="android.media.MediaPlayer.html#android.media.MediaPlayer.MEDIA_INFO_NOT_SEEKABLE" class="hiddenlink" target="rightframe">MEDIA_INFO_NOT_SEEKABLE</A>
+</nobr><br>
+<nobr><A HREF="android.media.MediaPlayer.html#android.media.MediaPlayer.MEDIA_INFO_UNKNOWN" class="hiddenlink" target="rightframe">MEDIA_INFO_UNKNOWN</A>
+</nobr><br>
+<nobr><A HREF="android.media.MediaPlayer.html#android.media.MediaPlayer.MEDIA_INFO_VIDEO_TRACK_LAGGING" class="hiddenlink" target="rightframe">MEDIA_INFO_VIDEO_TRACK_LAGGING</A>
+</nobr><br>
+<nobr><A HREF="android.os.Environment.html#android.os.Environment.MEDIA_NOFS" class="hiddenlink" target="rightframe">MEDIA_NOFS</A>
+</nobr><br>
+<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.MEDIA_RECORDER_ERROR_UNKNOWN" class="hiddenlink" target="rightframe">MEDIA_RECORDER_ERROR_UNKNOWN</A>
+</nobr><br>
+<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.MEDIA_RECORDER_INFO_MAX_DURATION_REACHED" class="hiddenlink" target="rightframe">MEDIA_RECORDER_INFO_MAX_DURATION_REACHED</A>
+</nobr><br>
+<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.MEDIA_RECORDER_INFO_MAX_FILESIZE_REACHED" class="hiddenlink" target="rightframe">MEDIA_RECORDER_INFO_MAX_FILESIZE_REACHED</A>
+</nobr><br>
+<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.MEDIA_RECORDER_INFO_UNKNOWN" class="hiddenlink" target="rightframe">MEDIA_RECORDER_INFO_UNKNOWN</A>
+</nobr><br>
+<nobr><A HREF="android.os.ParcelFileDescriptor.html#android.os.ParcelFileDescriptor.MODE_APPEND" class="hiddenlink" target="rightframe">MODE_APPEND</A>
+</nobr><br>
+<nobr><A HREF="android.Manifest.permission.html#android.Manifest.permission.MOUNT_FORMAT_FILESYSTEMS" class="hiddenlink" target="rightframe">MOUNT_FORMAT_FILESYSTEMS</A>
+</nobr><br>
+<nobr><A HREF="android.text.style.DynamicDrawableSpan.html#android.text.style.DynamicDrawableSpan.mVerticalAlignment" class="hiddenlink" target="rightframe">mVerticalAlignment</A>
+</nobr><br>
+<A NAME="N"></A>
+<br><font size="+2">N</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.R.attr.html#android.R.attr.noHistory" class="hiddenlink" target="rightframe">noHistory</A>
+</nobr><br>
+<nobr><A HREF="android.provider.MediaStore.Audio.AlbumColumns.html#android.provider.MediaStore.Audio.AlbumColumns.NUMBER_OF_SONGS_FOR_ARTIST" class="hiddenlink" target="rightframe">NUMBER_OF_SONGS_FOR_ARTIST</A>
+</nobr><br>
+<A NAME="P"></A>
+<br><font size="+2">P</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.R.id.html#android.R.id.paste" class="hiddenlink" target="rightframe">paste</A>
+</nobr><br>
+<i>PHONETIC_NAME</i><br>
+&nbsp;in&nbsp;
+<nobr><A HREF="android.provider.Contacts.Intents.Insert.html#android.provider.Contacts.Intents.Insert.PHONETIC_NAME" class="hiddenlink" target="rightframe">android.provider.Contacts.Intents.Insert</A>
+</nobr><br>
+&nbsp;in&nbsp;
+<nobr><A HREF="android.provider.Contacts.PeopleColumns.html#android.provider.Contacts.PeopleColumns.PHONETIC_NAME" class="hiddenlink" target="rightframe">android.provider.Contacts.PeopleColumns</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.popupCharacters" class="hiddenlink" target="rightframe">popupCharacters</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.popupKeyboard" class="hiddenlink" target="rightframe">popupKeyboard</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.popupLayout" class="hiddenlink" target="rightframe">popupLayout</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.privateImeOptions" class="hiddenlink" target="rightframe">privateImeOptions</A>
+</nobr><br>
+<A NAME="R"></A>
+<br><font size="+2">R</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.media.MediaRecorder.OutputFormat.html#android.media.MediaRecorder.OutputFormat.RAW_AMR" class="hiddenlink" target="rightframe">RAW_AMR</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.reqFiveWayNav" class="hiddenlink" target="rightframe">reqFiveWayNav</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.reqHardKeyboard" class="hiddenlink" target="rightframe">reqHardKeyboard</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.reqKeyboardType" class="hiddenlink" target="rightframe">reqKeyboardType</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.reqNavigation" class="hiddenlink" target="rightframe">reqNavigation</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.reqTouchScreen" class="hiddenlink" target="rightframe">reqTouchScreen</A>
+</nobr><br>
+<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.ROUTE_BLUETOOTH_A2DP" class="hiddenlink" target="rightframe">ROUTE_BLUETOOTH_A2DP</A>
+</nobr><br>
+<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.ROUTE_BLUETOOTH_SCO" class="hiddenlink" target="rightframe">ROUTE_BLUETOOTH_SCO</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.rowEdgeFlags" class="hiddenlink" target="rightframe">rowEdgeFlags</A>
+</nobr><br>
+<A NAME="S"></A>
+<br><font size="+2">S</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SCREEN_BRIGHTNESS_CHANGED" class="hiddenlink" target="rightframe">SCREEN_BRIGHTNESS_CHANGED</A>
+</nobr><br>
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SCREEN_ORIENTATION_CHANGED" class="hiddenlink" target="rightframe">SCREEN_ORIENTATION_CHANGED</A>
+</nobr><br>
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.screenBrightness" class="hiddenlink" target="rightframe">screenBrightness</A>
+</nobr><br>
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.screenOrientation" class="hiddenlink" target="rightframe">screenOrientation</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Contacts.Intents.Insert.html#android.provider.Contacts.Intents.Insert.SECONDARY_EMAIL" class="hiddenlink" target="rightframe">SECONDARY_EMAIL</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Contacts.Intents.Insert.html#android.provider.Contacts.Intents.Insert.SECONDARY_EMAIL_TYPE" class="hiddenlink" target="rightframe">SECONDARY_EMAIL_TYPE</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Contacts.Intents.Insert.html#android.provider.Contacts.Intents.Insert.SECONDARY_PHONE" class="hiddenlink" target="rightframe">SECONDARY_PHONE</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Contacts.Intents.Insert.html#android.provider.Contacts.Intents.Insert.SECONDARY_PHONE_TYPE" class="hiddenlink" target="rightframe">SECONDARY_PHONE_TYPE</A>
+</nobr><br>
+<nobr><A HREF="android.R.id.html#android.R.id.selectAll" class="hiddenlink" target="rightframe">selectAll</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.settingsActivity" class="hiddenlink" target="rightframe">settingsActivity</A>
+</nobr><br>
+<nobr><A HREF="android.content.pm.PackageInfo.html#android.content.pm.PackageInfo.sharedUserId" class="hiddenlink" target="rightframe">sharedUserId</A>
+</nobr><br>
+<i>sharedUserLabel</i><br>
+&nbsp;in&nbsp;
+<nobr><A HREF="android.R.attr.html#android.R.attr.sharedUserLabel" class="hiddenlink" target="rightframe">android.R.attr</A>
+</nobr><br>
+&nbsp;in&nbsp;
+<nobr><A HREF="android.content.pm.PackageInfo.html#android.content.pm.PackageInfo.sharedUserLabel" class="hiddenlink" target="rightframe">android.content.pm.PackageInfo</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Contacts.Intents.html#android.provider.Contacts.Intents.SHOW_OR_CREATE_CONTACT" class="hiddenlink" target="rightframe">SHOW_OR_CREATE_CONTACT</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.smoothScrollbar" class="hiddenlink" target="rightframe">smoothScrollbar</A>
+</nobr><br>
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN" class="hiddenlink" target="rightframe">SOFT_INPUT_ADJUST_PAN</A>
+</nobr><br>
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE" class="hiddenlink" target="rightframe">SOFT_INPUT_ADJUST_RESIZE</A>
+</nobr><br>
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SOFT_INPUT_ADJUST_UNSPECIFIED" class="hiddenlink" target="rightframe">SOFT_INPUT_ADJUST_UNSPECIFIED</A>
+</nobr><br>
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SOFT_INPUT_IS_FORWARD_NAVIGATION" class="hiddenlink" target="rightframe">SOFT_INPUT_IS_FORWARD_NAVIGATION</A>
+</nobr><br>
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SOFT_INPUT_MASK_ADJUST" class="hiddenlink" target="rightframe">SOFT_INPUT_MASK_ADJUST</A>
+</nobr><br>
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SOFT_INPUT_MASK_STATE" class="hiddenlink" target="rightframe">SOFT_INPUT_MASK_STATE</A>
+</nobr><br>
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SOFT_INPUT_MODE_CHANGED" class="hiddenlink" target="rightframe">SOFT_INPUT_MODE_CHANGED</A>
+</nobr><br>
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN" class="hiddenlink" target="rightframe">SOFT_INPUT_STATE_ALWAYS_HIDDEN</A>
+</nobr><br>
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE" class="hiddenlink" target="rightframe">SOFT_INPUT_STATE_ALWAYS_VISIBLE</A>
+</nobr><br>
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN" class="hiddenlink" target="rightframe">SOFT_INPUT_STATE_HIDDEN</A>
+</nobr><br>
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_UNCHANGED" class="hiddenlink" target="rightframe">SOFT_INPUT_STATE_UNCHANGED</A>
+</nobr><br>
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_UNSPECIFIED" class="hiddenlink" target="rightframe">SOFT_INPUT_STATE_UNSPECIFIED</A>
+</nobr><br>
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE" class="hiddenlink" target="rightframe">SOFT_INPUT_STATE_VISIBLE</A>
+</nobr><br>
+<i>softInputMode</i><br>
+&nbsp;in&nbsp;
+<nobr><A HREF="android.content.pm.ActivityInfo.html#android.content.pm.ActivityInfo.softInputMode" class="hiddenlink" target="rightframe">android.content.pm.ActivityInfo</A>
+</nobr><br>
+&nbsp;in&nbsp;
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.softInputMode" class="hiddenlink" target="rightframe">android.view.WindowManager.LayoutParams</A>
+</nobr><br>
+<nobr><A HREF="android.text.Spanned.html#android.text.Spanned.SPAN_COMPOSING" class="hiddenlink" target="rightframe">SPAN_COMPOSING</A>
+</nobr><br>
+<nobr><A HREF="android.text.Spanned.html#android.text.Spanned.SPAN_INTERMEDIATE" class="hiddenlink" target="rightframe">SPAN_INTERMEDIATE</A>
+</nobr><br>
+<nobr><A HREF="android.text.Spanned.html#android.text.Spanned.SPAN_POINT_MARK_MASK" class="hiddenlink" target="rightframe">SPAN_POINT_MARK_MASK</A>
+</nobr><br>
+<nobr><A HREF="android.R.id.html#android.R.id.startSelectingText" class="hiddenlink" target="rightframe">startSelectingText</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.state_long_pressable" class="hiddenlink" target="rightframe">state_long_pressable</A>
+</nobr><br>
+<nobr><A HREF="android.R.id.html#android.R.id.stopSelectingText" class="hiddenlink" target="rightframe">stopSelectingText</A>
+</nobr><br>
+<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.STREAM_NOTIFICATION" class="hiddenlink" target="rightframe">STREAM_NOTIFICATION</A>
+</nobr><br>
+<nobr><A HREF="android.widget.GridView.html#android.widget.GridView.STRETCH_SPACING_UNIFORM" class="hiddenlink" target="rightframe">STRETCH_SPACING_UNIFORM</A>
+</nobr><br>
+<nobr><A HREF="android.R.id.html#android.R.id.switchInputMethod" class="hiddenlink" target="rightframe">switchInputMethod</A>
+</nobr><br>
+<A NAME="T"></A>
+<br><font size="+2">T</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.provider.Contacts.Intents.Insert.html#android.provider.Contacts.Intents.Insert.TERTIARY_EMAIL" class="hiddenlink" target="rightframe">TERTIARY_EMAIL</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Contacts.Intents.Insert.html#android.provider.Contacts.Intents.Insert.TERTIARY_EMAIL_TYPE" class="hiddenlink" target="rightframe">TERTIARY_EMAIL_TYPE</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Contacts.Intents.Insert.html#android.provider.Contacts.Intents.Insert.TERTIARY_PHONE" class="hiddenlink" target="rightframe">TERTIARY_PHONE</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Contacts.Intents.Insert.html#android.provider.Contacts.Intents.Insert.TERTIARY_PHONE_TYPE" class="hiddenlink" target="rightframe">TERTIARY_PHONE_TYPE</A>
+</nobr><br>
+<nobr><A HREF="android.R.style.html#android.R.style.Theme_InputMethod" class="hiddenlink" target="rightframe">Theme_InputMethod</A>
+</nobr><br>
+<nobr><A HREF="android.R.style.html#android.R.style.Theme_Light_Panel" class="hiddenlink" target="rightframe">Theme_Light_Panel</A>
+</nobr><br>
+<nobr><A HREF="android.R.style.html#android.R.style.Theme_NoDisplay" class="hiddenlink" target="rightframe">Theme_NoDisplay</A>
+</nobr><br>
+<nobr><A HREF="android.R.style.html#android.R.style.Theme_Panel" class="hiddenlink" target="rightframe">Theme_Panel</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.thickness" class="hiddenlink" target="rightframe">thickness</A>
+</nobr><br>
+<nobr><A HREF="android.R.drawable.html#android.R.drawable.title_bar_tall" class="hiddenlink" target="rightframe">title_bar_tall</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.topOffset" class="hiddenlink" target="rightframe">topOffset</A>
+</nobr><br>
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.TYPE_APPLICATION_ATTACHED_DIALOG" class="hiddenlink" target="rightframe">TYPE_APPLICATION_ATTACHED_DIALOG</A>
+</nobr><br>
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD" class="hiddenlink" target="rightframe">TYPE_INPUT_METHOD</A>
+</nobr><br>
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD_DIALOG" class="hiddenlink" target="rightframe">TYPE_INPUT_METHOD_DIALOG</A>
+</nobr><br>
+<A NAME="U"></A>
+<br><font size="+2">U</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.content.res.AssetFileDescriptor.html#android.content.res.AssetFileDescriptor.UNKNOWN_LENGTH" class="hiddenlink" target="rightframe">UNKNOWN_LENGTH</A>
+</nobr><br>
+<nobr><A HREF="android.Manifest.permission.html#android.Manifest.permission.UPDATE_DEVICE_STATS" class="hiddenlink" target="rightframe">UPDATE_DEVICE_STATS</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.updatePeriodMillis" class="hiddenlink" target="rightframe">updatePeriodMillis</A>
+</nobr><br>
+<A NAME="V"></A>
+<br><font size="+2">V</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.R.attr.html#android.R.attr.verticalCorrection" class="hiddenlink" target="rightframe">verticalCorrection</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.verticalGap" class="hiddenlink" target="rightframe">verticalGap</A>
+</nobr><br>
+<nobr><A HREF="android.R.string.html#android.R.string.VideoView_error_text_invalid_progressive_playback" class="hiddenlink" target="rightframe">VideoView_error_text_invalid_progressive_playback</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.voiceLanguage" class="hiddenlink" target="rightframe">voiceLanguage</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.voiceLanguageModel" class="hiddenlink" target="rightframe">voiceLanguageModel</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.voiceMaxResults" class="hiddenlink" target="rightframe">voiceMaxResults</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.voicePromptText" class="hiddenlink" target="rightframe">voicePromptText</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.voiceSearchMode" class="hiddenlink" target="rightframe">voiceSearchMode</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.VOLUME_NOTIFICATION" class="hiddenlink" target="rightframe">VOLUME_NOTIFICATION</A>
+</nobr><br>
+<A NAME="W"></A>
+<br><font size="+2">W</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.R.style.html#android.R.style.Widget_KeyboardView" class="hiddenlink" target="rightframe">Widget_KeyboardView</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_MAX_DHCP_RETRY_COUNT" class="hiddenlink" target="rightframe">WIFI_MAX_DHCP_RETRY_COUNT</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS" class="hiddenlink" target="rightframe">WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS</A>
+</nobr><br>
+<nobr><A HREF="android.net.wifi.WifiManager.html#android.net.wifi.WifiManager.WIFI_MODE_FULL" class="hiddenlink" target="rightframe">WIFI_MODE_FULL</A>
+</nobr><br>
+<nobr><A HREF="android.net.wifi.WifiManager.html#android.net.wifi.WifiManager.WIFI_MODE_SCAN_ONLY" class="hiddenlink" target="rightframe">WIFI_MODE_SCAN_ONLY</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_SLEEP_POLICY" class="hiddenlink" target="rightframe">WIFI_SLEEP_POLICY</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_SLEEP_POLICY_DEFAULT" class="hiddenlink" target="rightframe">WIFI_SLEEP_POLICY_DEFAULT</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_SLEEP_POLICY_NEVER" class="hiddenlink" target="rightframe">WIFI_SLEEP_POLICY_NEVER</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_SLEEP_POLICY_NEVER_WHILE_PLUGGED" class="hiddenlink" target="rightframe">WIFI_SLEEP_POLICY_NEVER_WHILE_PLUGGED</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.windowDisablePreview" class="hiddenlink" target="rightframe">windowDisablePreview</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.windowNoDisplay" class="hiddenlink" target="rightframe">windowNoDisplay</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.windowSoftInputMode" class="hiddenlink" target="rightframe">windowSoftInputMode</A>
+</nobr><br>
+<nobr><A HREF="android.Manifest.permission.html#android.Manifest.permission.WRITE_SECURE_SETTINGS" class="hiddenlink" target="rightframe">WRITE_SECURE_SETTINGS</A>
+</nobr><br>
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/fields_index_all.html b/docs/html/sdk/api_diff/3/changes/fields_index_all.html
new file mode 100644
index 000000000000..786a36005452
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/fields_index_all.html
@@ -0,0 +1,1270 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+Field Differences Index
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY class="gc-documentation">
+<a NAME="topheader"></a>
+<table summary="Index for Fields" width="100%" class="jdiffIndex" border="0" cellspacing="0" cellpadding="0" style="padding-bottom:0;margin-bottom:0;">
+  <tr>
+  <th class="indexHeader">
+    Filter the Index:
+  </th>
+  </tr>
+  <tr>
+  <td class="indexText" style="line-height:1.3em;padding-left:2em;">
+<b>Fields</b>
+  <br>
+<A HREF="fields_index_removals.html" xclass="hiddenlink">Removals</A>
+  <br>
+<A HREF="fields_index_additions.html"xclass="hiddenlink">Additions</A>
+  <br>
+<A HREF="fields_index_changes.html"xclass="hiddenlink">Changes</A>
+  </td>
+  </tr>
+</table>
+<div id="indexTableCaption">
+<font size="-2"><strong>Bold</strong>&nbsp;indicates&nbsp;New;&nbsp;<strike>Strike</strike>&nbsp;indicates&nbsp;deleted. Plain indicates changed.</font>
+</div>
+<A NAME="A"></A>
+<br><font size="+2">A</font>&nbsp;
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.ACCELEROMETER_ROTATION" class="hiddenlink" target="rightframe">ACCELEROMETER_ROTATION</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.html#android.provider.Settings.ACTION_AIRPLANE_MODE_SETTINGS" class="hiddenlink" target="rightframe">ACTION_AIRPLANE_MODE_SETTINGS</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.html#android.provider.Settings.ACTION_APPLICATION_DEVELOPMENT_SETTINGS" class="hiddenlink" target="rightframe">ACTION_APPLICATION_DEVELOPMENT_SETTINGS</A>
+</nobr><br>
+<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.ACTION_AUDIO_BECOMING_NOISY" class="hiddenlink" target="rightframe">ACTION_AUDIO_BECOMING_NOISY</A>
+</nobr><br>
+<nobr><A HREF="android.net.ConnectivityManager.html#android.net.ConnectivityManager.ACTION_BACKGROUND_DATA_SETTING_CHANGED" class="hiddenlink" target="rightframe">ACTION_BACKGROUND_DATA_SETTING_CHANGED</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.html#android.provider.Settings.ACTION_DATA_ROAMING_SETTINGS" class="hiddenlink" target="rightframe">ACTION_DATA_ROAMING_SETTINGS</A>
+</nobr><br>
+<nobr><A HREF="android.provider.MediaStore.html#android.provider.MediaStore.ACTION_IMAGE_CAPTURE" class="hiddenlink" target="rightframe">ACTION_IMAGE_CAPTURE</A>
+</nobr><br>
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.ACTION_INPUT_METHOD_CHANGED" class="hiddenlink" target="rightframe">ACTION_INPUT_METHOD_CHANGED</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.html#android.provider.Settings.ACTION_INPUT_METHOD_SETTINGS" class="hiddenlink" target="rightframe">ACTION_INPUT_METHOD_SETTINGS</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.html#android.provider.Settings.ACTION_INTERNAL_STORAGE_SETTINGS" class="hiddenlink" target="rightframe">ACTION_INTERNAL_STORAGE_SETTINGS</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.html#android.provider.Settings.ACTION_MANAGE_APPLICATIONS_SETTINGS" class="hiddenlink" target="rightframe">ACTION_MANAGE_APPLICATIONS_SETTINGS</A>
+</nobr><br>
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.ACTION_MEDIA_CHECKING" class="hiddenlink" target="rightframe">ACTION_MEDIA_CHECKING</A>
+</nobr><br>
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.ACTION_MEDIA_NOFS" class="hiddenlink" target="rightframe">ACTION_MEDIA_NOFS</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.html#android.provider.Settings.ACTION_MEMORY_CARD_SETTINGS" class="hiddenlink" target="rightframe">ACTION_MEMORY_CARD_SETTINGS</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.html#android.provider.Settings.ACTION_NETWORK_OPERATOR_SETTINGS" class="hiddenlink" target="rightframe">ACTION_NETWORK_OPERATOR_SETTINGS</A>
+</nobr><br>
+<nobr><A HREF="android.view.MotionEvent.html#android.view.MotionEvent.ACTION_OUTSIDE" class="hiddenlink" target="rightframe">ACTION_OUTSIDE</A>
+</nobr><br>
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.ACTION_PACKAGE_DATA_CLEARED" class="hiddenlink" target="rightframe">ACTION_PACKAGE_DATA_CLEARED</A>
+</nobr><br>
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.ACTION_PACKAGE_REPLACED" class="hiddenlink" target="rightframe">ACTION_PACKAGE_REPLACED</A>
+</nobr><br>
+<nobr><A HREF="android.telephony.TelephonyManager.html#android.telephony.TelephonyManager.ACTION_PHONE_STATE_CHANGED" class="hiddenlink" target="rightframe">ACTION_PHONE_STATE_CHANGED</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.html#android.provider.Settings.ACTION_QUICK_LAUNCH_SETTINGS" class="hiddenlink" target="rightframe">ACTION_QUICK_LAUNCH_SETTINGS</A>
+</nobr><br>
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.ACTION_SEARCH_LONG_PRESS" class="hiddenlink" target="rightframe">ACTION_SEARCH_LONG_PRESS</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.html#android.provider.Settings.ACTION_SYNC_SETTINGS" class="hiddenlink" target="rightframe">ACTION_SYNC_SETTINGS</A>
+</nobr><br>
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.ACTION_SYSTEM_TUTORIAL" class="hiddenlink" target="rightframe">ACTION_SYSTEM_TUTORIAL</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.html#android.provider.Settings.ACTION_USER_DICTIONARY_SETTINGS" class="hiddenlink" target="rightframe">ACTION_USER_DICTIONARY_SETTINGS</A>
+</nobr><br>
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.ACTION_USER_PRESENT" class="hiddenlink" target="rightframe">ACTION_USER_PRESENT</A>
+</nobr><br>
+<nobr><A HREF="android.provider.MediaStore.html#android.provider.MediaStore.ACTION_VIDEO_CAPTURE" class="hiddenlink" target="rightframe">ACTION_VIDEO_CAPTURE</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.html#android.provider.Settings.ACTION_WIFI_IP_SETTINGS" class="hiddenlink" target="rightframe">ACTION_WIFI_IP_SETTINGS</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.ADB_ENABLED" class="hiddenlink" target="rightframe">ADB_ENABLED</A>
+</nobr><br>
+<nobr><A HREF="android.R.id.html#android.R.id.addToDictionary" class="hiddenlink" target="rightframe">addToDictionary</A>
+</nobr><br>
+<nobr><A HREF="android.text.style.DynamicDrawableSpan.html#android.text.style.DynamicDrawableSpan.ALIGN_BASELINE" class="hiddenlink" target="rightframe">ALIGN_BASELINE</A>
+</nobr><br>
+<nobr><A HREF="android.text.style.DynamicDrawableSpan.html#android.text.style.DynamicDrawableSpan.ALIGN_BOTTOM" class="hiddenlink" target="rightframe">ALIGN_BOTTOM</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.allowSingleTap" class="hiddenlink" target="rightframe">allowSingleTap</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.ANDROID_ID" class="hiddenlink" target="rightframe">ANDROID_ID</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.animateOnClick" class="hiddenlink" target="rightframe">animateOnClick</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.autoText" class="hiddenlink" target="rightframe">autoText</A>
+</nobr><br>
+<nobr><A HREF="android.view.Gravity.html#android.view.Gravity.AXIS_CLIP" class="hiddenlink" target="rightframe">AXIS_CLIP</A>
+</nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.AXIS_MINUS_X" class="hiddenlink" target="rightframe">AXIS_MINUS_X</A>
+</nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.AXIS_MINUS_Y" class="hiddenlink" target="rightframe">AXIS_MINUS_Y</A>
+</nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.AXIS_MINUS_Z" class="hiddenlink" target="rightframe">AXIS_MINUS_Z</A>
+</nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.AXIS_X" class="hiddenlink" target="rightframe">AXIS_X</A>
+</nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.AXIS_Y" class="hiddenlink" target="rightframe">AXIS_Y</A>
+</nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.AXIS_Z" class="hiddenlink" target="rightframe">AXIS_Z</A>
+</nobr><br>
+<A NAME="B"></A>
+<br><font size="+2">B</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.R.attr.html#android.R.attr.backgroundDimEnabled" class="hiddenlink" target="rightframe">backgroundDimEnabled</A>
+</nobr><br>
+<nobr><A HREF="android.Manifest.permission.html#android.Manifest.permission.BIND_APPWIDGET" class="hiddenlink" target="rightframe">BIND_APPWIDGET</A>
+</nobr><br>
+<nobr><A HREF="android.Manifest.permission.html#android.Manifest.permission.BIND_INPUT_METHOD" class="hiddenlink" target="rightframe">BIND_INPUT_METHOD</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.BLUETOOTH_ON" class="hiddenlink" target="rightframe">BLUETOOTH_ON</A>
+</nobr><br>
+<nobr><A HREF="android.provider.MediaStore.Video.VideoColumns.html#android.provider.MediaStore.Video.VideoColumns.BOOKMARK" class="hiddenlink" target="rightframe">BOOKMARK</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.bottomOffset" class="hiddenlink" target="rightframe">bottomOffset</A>
+</nobr><br>
+<nobr><A HREF="android.provider.MediaStore.Video.VideoColumns.html#android.provider.MediaStore.Video.VideoColumns.BUCKET_DISPLAY_NAME" class="hiddenlink" target="rightframe">BUCKET_DISPLAY_NAME</A>
+</nobr><br>
+<nobr><A HREF="android.provider.MediaStore.Video.VideoColumns.html#android.provider.MediaStore.Video.VideoColumns.BUCKET_ID" class="hiddenlink" target="rightframe">BUCKET_ID</A>
+</nobr><br>
+<nobr><A HREF="android.content.DialogInterface.html#android.content.DialogInterface.BUTTON1" class="hiddenlink" target="rightframe">BUTTON1</A>
+</nobr><br>
+<nobr><A HREF="android.content.DialogInterface.html#android.content.DialogInterface.BUTTON2" class="hiddenlink" target="rightframe">BUTTON2</A>
+</nobr><br>
+<nobr><A HREF="android.content.DialogInterface.html#android.content.DialogInterface.BUTTON3" class="hiddenlink" target="rightframe">BUTTON3</A>
+</nobr><br>
+<nobr><A HREF="android.content.DialogInterface.html#android.content.DialogInterface.BUTTON_NEGATIVE" class="hiddenlink" target="rightframe">BUTTON_NEGATIVE</A>
+</nobr><br>
+<nobr><A HREF="android.content.DialogInterface.html#android.content.DialogInterface.BUTTON_NEUTRAL" class="hiddenlink" target="rightframe">BUTTON_NEUTRAL</A>
+</nobr><br>
+<nobr><A HREF="android.content.DialogInterface.html#android.content.DialogInterface.BUTTON_POSITIVE" class="hiddenlink" target="rightframe">BUTTON_POSITIVE</A>
+</nobr><br>
+<A NAME="C"></A>
+<br><font size="+2">C</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.R.id.html#android.R.id.candidatesArea" class="hiddenlink" target="rightframe">candidatesArea</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.candidatesTextStyleSpans" class="hiddenlink" target="rightframe">candidatesTextStyleSpans</A>
+</nobr><br>
+<nobr><A HREF="android.text.TextUtils.html#android.text.TextUtils.CAP_MODE_CHARACTERS" class="hiddenlink" target="rightframe">CAP_MODE_CHARACTERS</A>
+</nobr><br>
+<nobr><A HREF="android.text.TextUtils.html#android.text.TextUtils.CAP_MODE_SENTENCES" class="hiddenlink" target="rightframe">CAP_MODE_SENTENCES</A>
+</nobr><br>
+<nobr><A HREF="android.text.TextUtils.html#android.text.TextUtils.CAP_MODE_WORDS" class="hiddenlink" target="rightframe">CAP_MODE_WORDS</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.capitalize" class="hiddenlink" target="rightframe">capitalize</A>
+</nobr><br>
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.CATEGORY_GADGET" class="hiddenlink" target="rightframe"><strike>CATEGORY_GADGET</strike></A>
+</nobr><br>
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.CATEGORY_INFO" class="hiddenlink" target="rightframe">CATEGORY_INFO</A>
+</nobr><br>
+<nobr><A HREF="android.view.Gravity.html#android.view.Gravity.CLIP_HORIZONTAL" class="hiddenlink" target="rightframe">CLIP_HORIZONTAL</A>
+</nobr><br>
+<nobr><A HREF="android.view.Gravity.html#android.view.Gravity.CLIP_VERTICAL" class="hiddenlink" target="rightframe">CLIP_VERTICAL</A>
+</nobr><br>
+<nobr><A HREF="android.R.id.html#android.R.id.closeButton" class="hiddenlink" target="rightframe">closeButton</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.codes" class="hiddenlink" target="rightframe">codes</A>
+</nobr><br>
+<nobr><A HREF="android.content.pm.PackageInfo.html#android.content.pm.PackageInfo.configPreferences" class="hiddenlink" target="rightframe">configPreferences</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.configure" class="hiddenlink" target="rightframe">configure</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.content" class="hiddenlink" target="rightframe">content</A>
+</nobr><br>
+<nobr><A HREF="android.R.id.html#android.R.id.copy" class="hiddenlink" target="rightframe">copy</A>
+</nobr><br>
+<nobr><A HREF="android.R.id.html#android.R.id.copyUrl" class="hiddenlink" target="rightframe">copyUrl</A>
+</nobr><br>
+<i>CREATOR</i><br>
+&nbsp;in&nbsp;
+<nobr><A HREF="android.content.res.AssetFileDescriptor.html#android.content.res.AssetFileDescriptor.CREATOR" class="hiddenlink" target="rightframe">android.content.res.AssetFileDescriptor</A>
+</nobr><br>
+&nbsp;in&nbsp;
+<nobr><A HREF="android.graphics.RectF.html#android.graphics.RectF.CREATOR" class="hiddenlink" target="rightframe">android.graphics.RectF</A>
+</nobr><br>
+<nobr><A HREF="android.R.id.html#android.R.id.cut" class="hiddenlink" target="rightframe">cut</A>
+</nobr><br>
+<A NAME="D"></A>
+<br><font size="+2">D</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.R.drawable.html#android.R.drawable.dark_header" class="hiddenlink" target="rightframe">dark_header</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.DATA_ROAMING" class="hiddenlink" target="rightframe">DATA_ROAMING</A>
+</nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.DATA_X" class="hiddenlink" target="rightframe">DATA_X</A>
+</nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.DATA_Y" class="hiddenlink" target="rightframe">DATA_Y</A>
+</nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.DATA_Z" class="hiddenlink" target="rightframe">DATA_Z</A>
+</nobr><br>
+<nobr><A HREF="dalvik.system.Zygote.html#dalvik.system.Zygote.DEBUG_ENABLE_ASSERT" class="hiddenlink" target="rightframe">DEBUG_ENABLE_ASSERT</A>
+</nobr><br>
+<nobr><A HREF="dalvik.system.Zygote.html#dalvik.system.Zygote.DEBUG_ENABLE_CHECKJNI" class="hiddenlink" target="rightframe">DEBUG_ENABLE_CHECKJNI</A>
+</nobr><br>
+<nobr><A HREF="dalvik.system.Zygote.html#dalvik.system.Zygote.DEBUG_ENABLE_DEBUGGER" class="hiddenlink" target="rightframe">DEBUG_ENABLE_DEBUGGER</A>
+</nobr><br>
+<i>DEFAULT_SORT_ORDER</i><br>
+&nbsp;in&nbsp;
+<nobr><A HREF="android.provider.MediaStore.Images.Media.html#android.provider.MediaStore.Images.Media.DEFAULT_SORT_ORDER" class="hiddenlink" target="rightframe">android.provider.MediaStore.Images.Media</A>
+</nobr><br>
+&nbsp;in&nbsp;
+<nobr><A HREF="android.provider.MediaStore.Video.html#android.provider.MediaStore.Video.DEFAULT_SORT_ORDER" class="hiddenlink" target="rightframe">android.provider.MediaStore.Video</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.DEVICE_PROVISIONED" class="hiddenlink" target="rightframe">DEVICE_PROVISIONED</A>
+</nobr><br>
+<nobr><A HREF="android.R.string.html#android.R.string.dialog_alert_title" class="hiddenlink" target="rightframe">dialog_alert_title</A>
+</nobr><br>
+<nobr><A HREF="android.os.Build.html#android.os.Build.DISPLAY" class="hiddenlink" target="rightframe">DISPLAY</A>
+</nobr><br>
+<nobr><A HREF="android.view.Gravity.html#android.view.Gravity.DISPLAY_CLIP_HORIZONTAL" class="hiddenlink" target="rightframe">DISPLAY_CLIP_HORIZONTAL</A>
+</nobr><br>
+<nobr><A HREF="android.view.Gravity.html#android.view.Gravity.DISPLAY_CLIP_VERTICAL" class="hiddenlink" target="rightframe">DISPLAY_CLIP_VERTICAL</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.dropDownAnchor" class="hiddenlink" target="rightframe">dropDownAnchor</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.dropDownWidth" class="hiddenlink" target="rightframe">dropDownWidth</A>
+</nobr><br>
+<A NAME="E"></A>
+<br><font size="+2">E</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.R.attr.html#android.R.attr.editable" class="hiddenlink" target="rightframe">editable</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.editorExtras" class="hiddenlink" target="rightframe">editorExtras</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.enabled" class="hiddenlink" target="rightframe">enabled</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Browser.html#android.provider.Browser.EXTRA_APPLICATION_ID" class="hiddenlink" target="rightframe">EXTRA_APPLICATION_ID</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Contacts.Intents.html#android.provider.Contacts.Intents.EXTRA_CREATE_DESCRIPTION" class="hiddenlink" target="rightframe">EXTRA_CREATE_DESCRIPTION</A>
+</nobr><br>
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.EXTRA_DATA_REMOVED" class="hiddenlink" target="rightframe">EXTRA_DATA_REMOVED</A>
+</nobr><br>
+<nobr><A HREF="android.provider.MediaStore.html#android.provider.MediaStore.EXTRA_FINISH_ON_COMPLETION" class="hiddenlink" target="rightframe">EXTRA_FINISH_ON_COMPLETION</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Contacts.Intents.html#android.provider.Contacts.Intents.EXTRA_FORCE_CREATE" class="hiddenlink" target="rightframe">EXTRA_FORCE_CREATE</A>
+</nobr><br>
+<nobr><A HREF="android.telephony.TelephonyManager.html#android.telephony.TelephonyManager.EXTRA_INCOMING_NUMBER" class="hiddenlink" target="rightframe">EXTRA_INCOMING_NUMBER</A>
+</nobr><br>
+<nobr><A HREF="android.provider.MediaStore.Audio.Media.html#android.provider.MediaStore.Audio.Media.EXTRA_MAX_BYTES" class="hiddenlink" target="rightframe">EXTRA_MAX_BYTES</A>
+</nobr><br>
+<nobr><A HREF="android.provider.MediaStore.html#android.provider.MediaStore.EXTRA_MEDIA_ALBUM" class="hiddenlink" target="rightframe">EXTRA_MEDIA_ALBUM</A>
+</nobr><br>
+<nobr><A HREF="android.provider.MediaStore.html#android.provider.MediaStore.EXTRA_MEDIA_ARTIST" class="hiddenlink" target="rightframe">EXTRA_MEDIA_ARTIST</A>
+</nobr><br>
+<nobr><A HREF="android.provider.MediaStore.html#android.provider.MediaStore.EXTRA_MEDIA_FOCUS" class="hiddenlink" target="rightframe">EXTRA_MEDIA_FOCUS</A>
+</nobr><br>
+<nobr><A HREF="android.provider.MediaStore.html#android.provider.MediaStore.EXTRA_MEDIA_TITLE" class="hiddenlink" target="rightframe">EXTRA_MEDIA_TITLE</A>
+</nobr><br>
+<nobr><A HREF="android.provider.MediaStore.html#android.provider.MediaStore.EXTRA_OUTPUT" class="hiddenlink" target="rightframe">EXTRA_OUTPUT</A>
+</nobr><br>
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.EXTRA_REPLACING" class="hiddenlink" target="rightframe">EXTRA_REPLACING</A>
+</nobr><br>
+<nobr><A HREF="android.provider.MediaStore.html#android.provider.MediaStore.EXTRA_SCREEN_ORIENTATION" class="hiddenlink" target="rightframe">EXTRA_SCREEN_ORIENTATION</A>
+</nobr><br>
+<nobr><A HREF="android.telephony.TelephonyManager.html#android.telephony.TelephonyManager.EXTRA_STATE" class="hiddenlink" target="rightframe">EXTRA_STATE</A>
+</nobr><br>
+<nobr><A HREF="android.telephony.TelephonyManager.html#android.telephony.TelephonyManager.EXTRA_STATE_IDLE" class="hiddenlink" target="rightframe">EXTRA_STATE_IDLE</A>
+</nobr><br>
+<nobr><A HREF="android.telephony.TelephonyManager.html#android.telephony.TelephonyManager.EXTRA_STATE_OFFHOOK" class="hiddenlink" target="rightframe">EXTRA_STATE_OFFHOOK</A>
+</nobr><br>
+<nobr><A HREF="android.telephony.TelephonyManager.html#android.telephony.TelephonyManager.EXTRA_STATE_RINGING" class="hiddenlink" target="rightframe">EXTRA_STATE_RINGING</A>
+</nobr><br>
+<nobr><A HREF="android.provider.MediaStore.html#android.provider.MediaStore.EXTRA_VIDEO_QUALITY" class="hiddenlink" target="rightframe">EXTRA_VIDEO_QUALITY</A>
+</nobr><br>
+<nobr><A HREF="android.R.id.html#android.R.id.extractArea" class="hiddenlink" target="rightframe">extractArea</A>
+</nobr><br>
+<A NAME="F"></A>
+<br><font size="+2">F</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.R.attr.html#android.R.attr.fastScrollEnabled" class="hiddenlink" target="rightframe">fastScrollEnabled</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.fillEnabled" class="hiddenlink" target="rightframe">fillEnabled</A>
+</nobr><br>
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET" class="hiddenlink" target="rightframe">FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET</A>
+</nobr><br>
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.FLAG_ACTIVITY_NO_USER_ACTION" class="hiddenlink" target="rightframe">FLAG_ACTIVITY_NO_USER_ACTION</A>
+</nobr><br>
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.FLAG_ACTIVITY_REORDER_TO_FRONT" class="hiddenlink" target="rightframe">FLAG_ACTIVITY_REORDER_TO_FRONT</A>
+</nobr><br>
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM" class="hiddenlink" target="rightframe">FLAG_ALT_FOCUSABLE_IM</A>
+</nobr><br>
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.FLAG_EDITOR_ACTION" class="hiddenlink" target="rightframe">FLAG_EDITOR_ACTION</A>
+</nobr><br>
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.FLAG_FROM_SYSTEM" class="hiddenlink" target="rightframe">FLAG_FROM_SYSTEM</A>
+</nobr><br>
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.FLAG_KEEP_TOUCH_MODE" class="hiddenlink" target="rightframe">FLAG_KEEP_TOUCH_MODE</A>
+</nobr><br>
+<nobr><A HREF="android.content.pm.ActivityInfo.html#android.content.pm.ActivityInfo.FLAG_NO_HISTORY" class="hiddenlink" target="rightframe">FLAG_NO_HISTORY</A>
+</nobr><br>
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.FLAG_SOFT_KEYBOARD" class="hiddenlink" target="rightframe">FLAG_SOFT_KEYBOARD</A>
+</nobr><br>
+<nobr><A HREF="android.app.PendingIntent.html#android.app.PendingIntent.FLAG_UPDATE_CURRENT" class="hiddenlink" target="rightframe">FLAG_UPDATE_CURRENT</A>
+</nobr><br>
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH" class="hiddenlink" target="rightframe">FLAG_WATCH_OUTSIDE_TOUCH</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.footerDividersEnabled" class="hiddenlink" target="rightframe">footerDividersEnabled</A>
+</nobr><br>
+<nobr><A HREF="android.telephony.PhoneNumberUtils.html#android.telephony.PhoneNumberUtils.FORMAT_JAPAN" class="hiddenlink" target="rightframe">FORMAT_JAPAN</A>
+</nobr><br>
+<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.FX_KEYPRESS_DELETE" class="hiddenlink" target="rightframe">FX_KEYPRESS_DELETE</A>
+</nobr><br>
+<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.FX_KEYPRESS_RETURN" class="hiddenlink" target="rightframe">FX_KEYPRESS_RETURN</A>
+</nobr><br>
+<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.FX_KEYPRESS_SPACEBAR" class="hiddenlink" target="rightframe">FX_KEYPRESS_SPACEBAR</A>
+</nobr><br>
+<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.FX_KEYPRESS_STANDARD" class="hiddenlink" target="rightframe">FX_KEYPRESS_STANDARD</A>
+</nobr><br>
+<A NAME="G"></A>
+<br><font size="+2">G</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.content.pm.PackageManager.html#android.content.pm.PackageManager.GET_CONFIGURATIONS" class="hiddenlink" target="rightframe">GET_CONFIGURATIONS</A>
+</nobr><br>
+<nobr><A HREF="android.content.pm.PackageManager.html#android.content.pm.PackageManager.GET_UNINSTALLED_PACKAGES" class="hiddenlink" target="rightframe">GET_UNINSTALLED_PACKAGES</A>
+</nobr><br>
+<A NAME="H"></A>
+<br><font size="+2">H</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.R.attr.html#android.R.attr.handle" class="hiddenlink" target="rightframe">handle</A>
+</nobr><br>
+<i>HAPTIC_FEEDBACK_ENABLED</i><br>
+&nbsp;in&nbsp;
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.HAPTIC_FEEDBACK_ENABLED" class="hiddenlink" target="rightframe">android.provider.Settings.System</A>
+</nobr><br>
+&nbsp;in&nbsp;
+<nobr><A HREF="android.view.View.html#android.view.View.HAPTIC_FEEDBACK_ENABLED" class="hiddenlink" target="rightframe">android.view.View</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.hapticFeedbackEnabled" class="hiddenlink" target="rightframe">hapticFeedbackEnabled</A>
+</nobr><br>
+<nobr><A HREF="android.content.res.Configuration.html#android.content.res.Configuration.hardKeyboardHidden" class="hiddenlink" target="rightframe">hardKeyboardHidden</A>
+</nobr><br>
+<nobr><A HREF="android.content.res.Configuration.html#android.content.res.Configuration.HARDKEYBOARDHIDDEN_NO" class="hiddenlink" target="rightframe">HARDKEYBOARDHIDDEN_NO</A>
+</nobr><br>
+<nobr><A HREF="android.content.res.Configuration.html#android.content.res.Configuration.HARDKEYBOARDHIDDEN_UNDEFINED" class="hiddenlink" target="rightframe">HARDKEYBOARDHIDDEN_UNDEFINED</A>
+</nobr><br>
+<nobr><A HREF="android.content.res.Configuration.html#android.content.res.Configuration.HARDKEYBOARDHIDDEN_YES" class="hiddenlink" target="rightframe">HARDKEYBOARDHIDDEN_YES</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.headerDividersEnabled" class="hiddenlink" target="rightframe">headerDividersEnabled</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.horizontalGap" class="hiddenlink" target="rightframe">horizontalGap</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.HTTP_PROXY" class="hiddenlink" target="rightframe">HTTP_PROXY</A>
+</nobr><br>
+<A NAME="I"></A>
+<br><font size="+2">I</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.R.drawable.html#android.R.drawable.ic_btn_speak_now" class="hiddenlink" target="rightframe">ic_btn_speak_now</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.iconPreview" class="hiddenlink" target="rightframe">iconPreview</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.imeActionId" class="hiddenlink" target="rightframe">imeActionId</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.imeActionLabel" class="hiddenlink" target="rightframe">imeActionLabel</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.imeExtractEnterAnimation" class="hiddenlink" target="rightframe">imeExtractEnterAnimation</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.imeExtractExitAnimation" class="hiddenlink" target="rightframe">imeExtractExitAnimation</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.imeFullscreenBackground" class="hiddenlink" target="rightframe">imeFullscreenBackground</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.imeOptions" class="hiddenlink" target="rightframe">imeOptions</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.initialLayout" class="hiddenlink" target="rightframe">initialLayout</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.innerRadius" class="hiddenlink" target="rightframe">innerRadius</A>
+</nobr><br>
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.INPUT_METHOD_FROM_FOCUSABLE" class="hiddenlink" target="rightframe">INPUT_METHOD_FROM_FOCUSABLE</A>
+</nobr><br>
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.INPUT_METHOD_NEEDED" class="hiddenlink" target="rightframe">INPUT_METHOD_NEEDED</A>
+</nobr><br>
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.INPUT_METHOD_NOT_NEEDED" class="hiddenlink" target="rightframe">INPUT_METHOD_NOT_NEEDED</A>
+</nobr><br>
+<nobr><A HREF="android.content.Context.html#android.content.Context.INPUT_METHOD_SERVICE" class="hiddenlink" target="rightframe">INPUT_METHOD_SERVICE</A>
+</nobr><br>
+<nobr><A HREF="android.R.id.html#android.R.id.inputArea" class="hiddenlink" target="rightframe">inputArea</A>
+</nobr><br>
+<nobr><A HREF="android.R.id.html#android.R.id.inputExtractEditText" class="hiddenlink" target="rightframe">inputExtractEditText</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.inputMethod" class="hiddenlink" target="rightframe">inputMethod</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.inputType" class="hiddenlink" target="rightframe">inputType</A>
+</nobr><br>
+<nobr><A HREF="android.content.pm.PackageManager.html#android.content.pm.PackageManager.INSTALL_FAILED_CONFLICTING_PROVIDER" class="hiddenlink" target="rightframe">INSTALL_FAILED_CONFLICTING_PROVIDER</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.INSTALL_NON_MARKET_APPS" class="hiddenlink" target="rightframe">INSTALL_NON_MARKET_APPS</A>
+</nobr><br>
+<nobr><A HREF="android.provider.MediaStore.html#android.provider.MediaStore.INTENT_ACTION_MEDIA_SEARCH" class="hiddenlink" target="rightframe">INTENT_ACTION_MEDIA_SEARCH</A>
+</nobr><br>
+<nobr><A HREF="android.provider.MediaStore.html#android.provider.MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA" class="hiddenlink" target="rightframe">INTENT_ACTION_STILL_IMAGE_CAMERA</A>
+</nobr><br>
+<nobr><A HREF="android.provider.MediaStore.html#android.provider.MediaStore.INTENT_ACTION_VIDEO_CAMERA" class="hiddenlink" target="rightframe">INTENT_ACTION_VIDEO_CAMERA</A>
+</nobr><br>
+<nobr><A HREF="android.app.AlarmManager.html#android.app.AlarmManager.INTERVAL_DAY" class="hiddenlink" target="rightframe">INTERVAL_DAY</A>
+</nobr><br>
+<nobr><A HREF="android.app.AlarmManager.html#android.app.AlarmManager.INTERVAL_FIFTEEN_MINUTES" class="hiddenlink" target="rightframe">INTERVAL_FIFTEEN_MINUTES</A>
+</nobr><br>
+<nobr><A HREF="android.app.AlarmManager.html#android.app.AlarmManager.INTERVAL_HALF_DAY" class="hiddenlink" target="rightframe">INTERVAL_HALF_DAY</A>
+</nobr><br>
+<nobr><A HREF="android.app.AlarmManager.html#android.app.AlarmManager.INTERVAL_HALF_HOUR" class="hiddenlink" target="rightframe">INTERVAL_HALF_HOUR</A>
+</nobr><br>
+<nobr><A HREF="android.app.AlarmManager.html#android.app.AlarmManager.INTERVAL_HOUR" class="hiddenlink" target="rightframe">INTERVAL_HOUR</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.isDefault" class="hiddenlink" target="rightframe">isDefault</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.isModifier" class="hiddenlink" target="rightframe">isModifier</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.isRepeatable" class="hiddenlink" target="rightframe">isRepeatable</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.isScrollContainer" class="hiddenlink" target="rightframe">isScrollContainer</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.isSticky" class="hiddenlink" target="rightframe">isSticky</A>
+</nobr><br>
+<A NAME="K"></A>
+<br><font size="+2">K</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.KEY_LOCATION_CHANGED" class="hiddenlink" target="rightframe">KEY_LOCATION_CHANGED</A>
+</nobr><br>
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.KEY_PROVIDER_ENABLED" class="hiddenlink" target="rightframe">KEY_PROVIDER_ENABLED</A>
+</nobr><br>
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.KEY_STATUS_CHANGED" class="hiddenlink" target="rightframe">KEY_STATUS_CHANGED</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.keyBackground" class="hiddenlink" target="rightframe">keyBackground</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.keyboardMode" class="hiddenlink" target="rightframe">keyboardMode</A>
+</nobr><br>
+<nobr><A HREF="android.R.id.html#android.R.id.keyboardView" class="hiddenlink" target="rightframe">keyboardView</A>
+</nobr><br>
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.KEYCODE_MEDIA_FAST_FORWARD" class="hiddenlink" target="rightframe">KEYCODE_MEDIA_FAST_FORWARD</A>
+</nobr><br>
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.KEYCODE_MEDIA_NEXT" class="hiddenlink" target="rightframe">KEYCODE_MEDIA_NEXT</A>
+</nobr><br>
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE" class="hiddenlink" target="rightframe">KEYCODE_MEDIA_PLAY_PAUSE</A>
+</nobr><br>
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.KEYCODE_MEDIA_PREVIOUS" class="hiddenlink" target="rightframe">KEYCODE_MEDIA_PREVIOUS</A>
+</nobr><br>
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.KEYCODE_MEDIA_REWIND" class="hiddenlink" target="rightframe">KEYCODE_MEDIA_REWIND</A>
+</nobr><br>
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.KEYCODE_MEDIA_STOP" class="hiddenlink" target="rightframe">KEYCODE_MEDIA_STOP</A>
+</nobr><br>
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.KEYCODE_MUTE" class="hiddenlink" target="rightframe">KEYCODE_MUTE</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.keyEdgeFlags" class="hiddenlink" target="rightframe">keyEdgeFlags</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.keyHeight" class="hiddenlink" target="rightframe">keyHeight</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.keyIcon" class="hiddenlink" target="rightframe">keyIcon</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.keyLabel" class="hiddenlink" target="rightframe">keyLabel</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.keyOutputText" class="hiddenlink" target="rightframe">keyOutputText</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.keyPreviewHeight" class="hiddenlink" target="rightframe">keyPreviewHeight</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.keyPreviewLayout" class="hiddenlink" target="rightframe">keyPreviewLayout</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.keyPreviewOffset" class="hiddenlink" target="rightframe">keyPreviewOffset</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.keyTextColor" class="hiddenlink" target="rightframe">keyTextColor</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.keyTextSize" class="hiddenlink" target="rightframe">keyTextSize</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.keyWidth" class="hiddenlink" target="rightframe">keyWidth</A>
+</nobr><br>
+<A NAME="L"></A>
+<br><font size="+2">L</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.R.attr.html#android.R.attr.labelTextSize" class="hiddenlink" target="rightframe">labelTextSize</A>
+</nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.LIGHT_NO_MOON" class="hiddenlink" target="rightframe">LIGHT_NO_MOON</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.LOCATION_PROVIDERS_ALLOWED" class="hiddenlink" target="rightframe">LOCATION_PROVIDERS_ALLOWED</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.LOCK_PATTERN_TACTILE_FEEDBACK_ENABLED" class="hiddenlink" target="rightframe">LOCK_PATTERN_TACTILE_FEEDBACK_ENABLED</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.LOGGING_ID" class="hiddenlink" target="rightframe">LOGGING_ID</A>
+</nobr><br>
+<A NAME="M"></A>
+<br><font size="+2">M</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.MAX_KEYCODE" class="hiddenlink" target="rightframe">MAX_KEYCODE</A>
+</nobr><br>
+<nobr><A HREF="android.os.Environment.html#android.os.Environment.MEDIA_CHECKING" class="hiddenlink" target="rightframe">MEDIA_CHECKING</A>
+</nobr><br>
+<nobr><A HREF="android.media.MediaPlayer.html#android.media.MediaPlayer.MEDIA_ERROR_NOT_VALID_FOR_PROGRESSIVE_PLAYBACK" class="hiddenlink" target="rightframe">MEDIA_ERROR_NOT_VALID_FOR_PROGRESSIVE_PLAYBACK</A>
+</nobr><br>
+<nobr><A HREF="android.media.MediaPlayer.html#android.media.MediaPlayer.MEDIA_INFO_BAD_INTERLEAVING" class="hiddenlink" target="rightframe">MEDIA_INFO_BAD_INTERLEAVING</A>
+</nobr><br>
+<nobr><A HREF="android.media.MediaPlayer.html#android.media.MediaPlayer.MEDIA_INFO_NOT_SEEKABLE" class="hiddenlink" target="rightframe">MEDIA_INFO_NOT_SEEKABLE</A>
+</nobr><br>
+<nobr><A HREF="android.media.MediaPlayer.html#android.media.MediaPlayer.MEDIA_INFO_UNKNOWN" class="hiddenlink" target="rightframe">MEDIA_INFO_UNKNOWN</A>
+</nobr><br>
+<nobr><A HREF="android.media.MediaPlayer.html#android.media.MediaPlayer.MEDIA_INFO_VIDEO_TRACK_LAGGING" class="hiddenlink" target="rightframe">MEDIA_INFO_VIDEO_TRACK_LAGGING</A>
+</nobr><br>
+<nobr><A HREF="android.os.Environment.html#android.os.Environment.MEDIA_NOFS" class="hiddenlink" target="rightframe">MEDIA_NOFS</A>
+</nobr><br>
+<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.MEDIA_RECORDER_ERROR_UNKNOWN" class="hiddenlink" target="rightframe">MEDIA_RECORDER_ERROR_UNKNOWN</A>
+</nobr><br>
+<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.MEDIA_RECORDER_INFO_MAX_DURATION_REACHED" class="hiddenlink" target="rightframe">MEDIA_RECORDER_INFO_MAX_DURATION_REACHED</A>
+</nobr><br>
+<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.MEDIA_RECORDER_INFO_MAX_FILESIZE_REACHED" class="hiddenlink" target="rightframe">MEDIA_RECORDER_INFO_MAX_FILESIZE_REACHED</A>
+</nobr><br>
+<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.MEDIA_RECORDER_INFO_UNKNOWN" class="hiddenlink" target="rightframe">MEDIA_RECORDER_INFO_UNKNOWN</A>
+</nobr><br>
+<nobr><A HREF="android.os.ParcelFileDescriptor.html#android.os.ParcelFileDescriptor.MODE_APPEND" class="hiddenlink" target="rightframe">MODE_APPEND</A>
+</nobr><br>
+<nobr><A HREF="android.Manifest.permission.html#android.Manifest.permission.MOUNT_FORMAT_FILESYSTEMS" class="hiddenlink" target="rightframe">MOUNT_FORMAT_FILESYSTEMS</A>
+</nobr><br>
+<nobr><A HREF="android.text.style.DynamicDrawableSpan.html#android.text.style.DynamicDrawableSpan.mVerticalAlignment" class="hiddenlink" target="rightframe">mVerticalAlignment</A>
+</nobr><br>
+<A NAME="N"></A>
+<br><font size="+2">N</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.NETWORK_PREFERENCE" class="hiddenlink" target="rightframe">NETWORK_PREFERENCE</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.noHistory" class="hiddenlink" target="rightframe">noHistory</A>
+</nobr><br>
+<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.NUM_STREAMS" class="hiddenlink" target="rightframe">NUM_STREAMS</A>
+</nobr><br>
+<nobr><A HREF="android.provider.MediaStore.Audio.AlbumColumns.html#android.provider.MediaStore.Audio.AlbumColumns.NUMBER_OF_SONGS_FOR_ARTIST" class="hiddenlink" target="rightframe">NUMBER_OF_SONGS_FOR_ARTIST</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.numeric" class="hiddenlink" target="rightframe">numeric</A>
+</nobr><br>
+<A NAME="P"></A>
+<br><font size="+2">P</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.PARENTAL_CONTROL_ENABLED" class="hiddenlink" target="rightframe">PARENTAL_CONTROL_ENABLED</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.PARENTAL_CONTROL_LAST_UPDATE" class="hiddenlink" target="rightframe">PARENTAL_CONTROL_LAST_UPDATE</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.PARENTAL_CONTROL_REDIRECT_URL" class="hiddenlink" target="rightframe">PARENTAL_CONTROL_REDIRECT_URL</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.password" class="hiddenlink" target="rightframe">password</A>
+</nobr><br>
+<nobr><A HREF="android.R.id.html#android.R.id.paste" class="hiddenlink" target="rightframe">paste</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.phoneNumber" class="hiddenlink" target="rightframe">phoneNumber</A>
+</nobr><br>
+<i>PHONETIC_NAME</i><br>
+&nbsp;in&nbsp;
+<nobr><A HREF="android.provider.Contacts.Intents.Insert.html#android.provider.Contacts.Intents.Insert.PHONETIC_NAME" class="hiddenlink" target="rightframe">android.provider.Contacts.Intents.Insert</A>
+</nobr><br>
+&nbsp;in&nbsp;
+<nobr><A HREF="android.provider.Contacts.PeopleColumns.html#android.provider.Contacts.PeopleColumns.PHONETIC_NAME" class="hiddenlink" target="rightframe">android.provider.Contacts.PeopleColumns</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.popupCharacters" class="hiddenlink" target="rightframe">popupCharacters</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.popupKeyboard" class="hiddenlink" target="rightframe">popupKeyboard</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.popupLayout" class="hiddenlink" target="rightframe">popupLayout</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.privateImeOptions" class="hiddenlink" target="rightframe">privateImeOptions</A>
+</nobr><br>
+<A NAME="R"></A>
+<br><font size="+2">R</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.media.MediaRecorder.OutputFormat.html#android.media.MediaRecorder.OutputFormat.RAW_AMR" class="hiddenlink" target="rightframe">RAW_AMR</A>
+</nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.RAW_DATA_INDEX" class="hiddenlink" target="rightframe">RAW_DATA_INDEX</A>
+</nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.RAW_DATA_X" class="hiddenlink" target="rightframe">RAW_DATA_X</A>
+</nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.RAW_DATA_Y" class="hiddenlink" target="rightframe">RAW_DATA_Y</A>
+</nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.RAW_DATA_Z" class="hiddenlink" target="rightframe">RAW_DATA_Z</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.reqFiveWayNav" class="hiddenlink" target="rightframe">reqFiveWayNav</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.reqHardKeyboard" class="hiddenlink" target="rightframe">reqHardKeyboard</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.reqKeyboardType" class="hiddenlink" target="rightframe">reqKeyboardType</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.reqNavigation" class="hiddenlink" target="rightframe">reqNavigation</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.reqTouchScreen" class="hiddenlink" target="rightframe">reqTouchScreen</A>
+</nobr><br>
+<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.ROUTE_BLUETOOTH" class="hiddenlink" target="rightframe">ROUTE_BLUETOOTH</A>
+</nobr><br>
+<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.ROUTE_BLUETOOTH_A2DP" class="hiddenlink" target="rightframe">ROUTE_BLUETOOTH_A2DP</A>
+</nobr><br>
+<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.ROUTE_BLUETOOTH_SCO" class="hiddenlink" target="rightframe">ROUTE_BLUETOOTH_SCO</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.rowEdgeFlags" class="hiddenlink" target="rightframe">rowEdgeFlags</A>
+</nobr><br>
+<A NAME="S"></A>
+<br><font size="+2">S</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SCREEN_BRIGHTNESS_CHANGED" class="hiddenlink" target="rightframe">SCREEN_BRIGHTNESS_CHANGED</A>
+</nobr><br>
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SCREEN_ORIENTATION_CHANGED" class="hiddenlink" target="rightframe">SCREEN_ORIENTATION_CHANGED</A>
+</nobr><br>
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.screenBrightness" class="hiddenlink" target="rightframe">screenBrightness</A>
+</nobr><br>
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.screenOrientation" class="hiddenlink" target="rightframe">screenOrientation</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.searchButtonText" class="hiddenlink" target="rightframe">searchButtonText</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Contacts.Intents.Insert.html#android.provider.Contacts.Intents.Insert.SECONDARY_EMAIL" class="hiddenlink" target="rightframe">SECONDARY_EMAIL</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Contacts.Intents.Insert.html#android.provider.Contacts.Intents.Insert.SECONDARY_EMAIL_TYPE" class="hiddenlink" target="rightframe">SECONDARY_EMAIL_TYPE</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Contacts.Intents.Insert.html#android.provider.Contacts.Intents.Insert.SECONDARY_PHONE" class="hiddenlink" target="rightframe">SECONDARY_PHONE</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Contacts.Intents.Insert.html#android.provider.Contacts.Intents.Insert.SECONDARY_PHONE_TYPE" class="hiddenlink" target="rightframe">SECONDARY_PHONE_TYPE</A>
+</nobr><br>
+<nobr><A HREF="android.R.id.html#android.R.id.selectAll" class="hiddenlink" target="rightframe">selectAll</A>
+</nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.SENSOR_ACCELEROMETER" class="hiddenlink" target="rightframe">SENSOR_ACCELEROMETER</A>
+</nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.SENSOR_ALL" class="hiddenlink" target="rightframe">SENSOR_ALL</A>
+</nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.SENSOR_LIGHT" class="hiddenlink" target="rightframe">SENSOR_LIGHT</A>
+</nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.SENSOR_MAGNETIC_FIELD" class="hiddenlink" target="rightframe">SENSOR_MAGNETIC_FIELD</A>
+</nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.SENSOR_MAX" class="hiddenlink" target="rightframe">SENSOR_MAX</A>
+</nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.SENSOR_MIN" class="hiddenlink" target="rightframe">SENSOR_MIN</A>
+</nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.SENSOR_ORIENTATION" class="hiddenlink" target="rightframe">SENSOR_ORIENTATION</A>
+</nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.SENSOR_ORIENTATION_RAW" class="hiddenlink" target="rightframe">SENSOR_ORIENTATION_RAW</A>
+</nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.SENSOR_PROXIMITY" class="hiddenlink" target="rightframe">SENSOR_PROXIMITY</A>
+</nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.SENSOR_TEMPERATURE" class="hiddenlink" target="rightframe">SENSOR_TEMPERATURE</A>
+</nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.SENSOR_TRICORDER" class="hiddenlink" target="rightframe">SENSOR_TRICORDER</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.SETTINGS_CLASSNAME" class="hiddenlink" target="rightframe">SETTINGS_CLASSNAME</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.settingsActivity" class="hiddenlink" target="rightframe">settingsActivity</A>
+</nobr><br>
+<nobr><A HREF="android.content.pm.PackageInfo.html#android.content.pm.PackageInfo.sharedUserId" class="hiddenlink" target="rightframe">sharedUserId</A>
+</nobr><br>
+<i>sharedUserLabel</i><br>
+&nbsp;in&nbsp;
+<nobr><A HREF="android.R.attr.html#android.R.attr.sharedUserLabel" class="hiddenlink" target="rightframe">android.R.attr</A>
+</nobr><br>
+&nbsp;in&nbsp;
+<nobr><A HREF="android.content.pm.PackageInfo.html#android.content.pm.PackageInfo.sharedUserLabel" class="hiddenlink" target="rightframe">android.content.pm.PackageInfo</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Contacts.Intents.html#android.provider.Contacts.Intents.SHOW_OR_CREATE_CONTACT" class="hiddenlink" target="rightframe">SHOW_OR_CREATE_CONTACT</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.singleLine" class="hiddenlink" target="rightframe">singleLine</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.smoothScrollbar" class="hiddenlink" target="rightframe">smoothScrollbar</A>
+</nobr><br>
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN" class="hiddenlink" target="rightframe">SOFT_INPUT_ADJUST_PAN</A>
+</nobr><br>
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE" class="hiddenlink" target="rightframe">SOFT_INPUT_ADJUST_RESIZE</A>
+</nobr><br>
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SOFT_INPUT_ADJUST_UNSPECIFIED" class="hiddenlink" target="rightframe">SOFT_INPUT_ADJUST_UNSPECIFIED</A>
+</nobr><br>
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SOFT_INPUT_IS_FORWARD_NAVIGATION" class="hiddenlink" target="rightframe">SOFT_INPUT_IS_FORWARD_NAVIGATION</A>
+</nobr><br>
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SOFT_INPUT_MASK_ADJUST" class="hiddenlink" target="rightframe">SOFT_INPUT_MASK_ADJUST</A>
+</nobr><br>
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SOFT_INPUT_MASK_STATE" class="hiddenlink" target="rightframe">SOFT_INPUT_MASK_STATE</A>
+</nobr><br>
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SOFT_INPUT_MODE_CHANGED" class="hiddenlink" target="rightframe">SOFT_INPUT_MODE_CHANGED</A>
+</nobr><br>
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN" class="hiddenlink" target="rightframe">SOFT_INPUT_STATE_ALWAYS_HIDDEN</A>
+</nobr><br>
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE" class="hiddenlink" target="rightframe">SOFT_INPUT_STATE_ALWAYS_VISIBLE</A>
+</nobr><br>
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN" class="hiddenlink" target="rightframe">SOFT_INPUT_STATE_HIDDEN</A>
+</nobr><br>
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_UNCHANGED" class="hiddenlink" target="rightframe">SOFT_INPUT_STATE_UNCHANGED</A>
+</nobr><br>
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_UNSPECIFIED" class="hiddenlink" target="rightframe">SOFT_INPUT_STATE_UNSPECIFIED</A>
+</nobr><br>
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE" class="hiddenlink" target="rightframe">SOFT_INPUT_STATE_VISIBLE</A>
+</nobr><br>
+<i>softInputMode</i><br>
+&nbsp;in&nbsp;
+<nobr><A HREF="android.content.pm.ActivityInfo.html#android.content.pm.ActivityInfo.softInputMode" class="hiddenlink" target="rightframe">android.content.pm.ActivityInfo</A>
+</nobr><br>
+&nbsp;in&nbsp;
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.softInputMode" class="hiddenlink" target="rightframe">android.view.WindowManager.LayoutParams</A>
+</nobr><br>
+<nobr><A HREF="android.text.Spanned.html#android.text.Spanned.SPAN_COMPOSING" class="hiddenlink" target="rightframe">SPAN_COMPOSING</A>
+</nobr><br>
+<nobr><A HREF="android.text.Spanned.html#android.text.Spanned.SPAN_INTERMEDIATE" class="hiddenlink" target="rightframe">SPAN_INTERMEDIATE</A>
+</nobr><br>
+<nobr><A HREF="android.text.Spanned.html#android.text.Spanned.SPAN_POINT_MARK_MASK" class="hiddenlink" target="rightframe">SPAN_POINT_MARK_MASK</A>
+</nobr><br>
+<nobr><A HREF="android.R.id.html#android.R.id.startSelectingText" class="hiddenlink" target="rightframe">startSelectingText</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.state_long_pressable" class="hiddenlink" target="rightframe">state_long_pressable</A>
+</nobr><br>
+<nobr><A HREF="android.R.id.html#android.R.id.stopSelectingText" class="hiddenlink" target="rightframe">stopSelectingText</A>
+</nobr><br>
+<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.STREAM_NOTIFICATION" class="hiddenlink" target="rightframe">STREAM_NOTIFICATION</A>
+</nobr><br>
+<nobr><A HREF="android.widget.GridView.html#android.widget.GridView.STRETCH_SPACING_UNIFORM" class="hiddenlink" target="rightframe">STRETCH_SPACING_UNIFORM</A>
+</nobr><br>
+<nobr><A HREF="android.R.id.html#android.R.id.switchInputMethod" class="hiddenlink" target="rightframe">switchInputMethod</A>
+</nobr><br>
+<A NAME="T"></A>
+<br><font size="+2">T</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.provider.Contacts.Intents.Insert.html#android.provider.Contacts.Intents.Insert.TERTIARY_EMAIL" class="hiddenlink" target="rightframe">TERTIARY_EMAIL</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Contacts.Intents.Insert.html#android.provider.Contacts.Intents.Insert.TERTIARY_EMAIL_TYPE" class="hiddenlink" target="rightframe">TERTIARY_EMAIL_TYPE</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Contacts.Intents.Insert.html#android.provider.Contacts.Intents.Insert.TERTIARY_PHONE" class="hiddenlink" target="rightframe">TERTIARY_PHONE</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Contacts.Intents.Insert.html#android.provider.Contacts.Intents.Insert.TERTIARY_PHONE_TYPE" class="hiddenlink" target="rightframe">TERTIARY_PHONE_TYPE</A>
+</nobr><br>
+<nobr><A HREF="android.R.style.html#android.R.style.Theme_InputMethod" class="hiddenlink" target="rightframe">Theme_InputMethod</A>
+</nobr><br>
+<nobr><A HREF="android.R.style.html#android.R.style.Theme_Light_Panel" class="hiddenlink" target="rightframe">Theme_Light_Panel</A>
+</nobr><br>
+<nobr><A HREF="android.R.style.html#android.R.style.Theme_NoDisplay" class="hiddenlink" target="rightframe">Theme_NoDisplay</A>
+</nobr><br>
+<nobr><A HREF="android.R.style.html#android.R.style.Theme_Panel" class="hiddenlink" target="rightframe">Theme_Panel</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.thickness" class="hiddenlink" target="rightframe">thickness</A>
+</nobr><br>
+<nobr><A HREF="android.R.drawable.html#android.R.drawable.title_bar_tall" class="hiddenlink" target="rightframe">title_bar_tall</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.topOffset" class="hiddenlink" target="rightframe">topOffset</A>
+</nobr><br>
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.TYPE_APPLICATION_ATTACHED_DIALOG" class="hiddenlink" target="rightframe">TYPE_APPLICATION_ATTACHED_DIALOG</A>
+</nobr><br>
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD" class="hiddenlink" target="rightframe">TYPE_INPUT_METHOD</A>
+</nobr><br>
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD_DIALOG" class="hiddenlink" target="rightframe">TYPE_INPUT_METHOD_DIALOG</A>
+</nobr><br>
+<A NAME="U"></A>
+<br><font size="+2">U</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.content.res.AssetFileDescriptor.html#android.content.res.AssetFileDescriptor.UNKNOWN_LENGTH" class="hiddenlink" target="rightframe">UNKNOWN_LENGTH</A>
+</nobr><br>
+<nobr><A HREF="android.Manifest.permission.html#android.Manifest.permission.UPDATE_DEVICE_STATS" class="hiddenlink" target="rightframe">UPDATE_DEVICE_STATS</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.updatePeriodMillis" class="hiddenlink" target="rightframe">updatePeriodMillis</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.USB_MASS_STORAGE_ENABLED" class="hiddenlink" target="rightframe">USB_MASS_STORAGE_ENABLED</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.USE_GOOGLE_MAIL" class="hiddenlink" target="rightframe">USE_GOOGLE_MAIL</A>
+</nobr><br>
+<A NAME="V"></A>
+<br><font size="+2">V</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.R.attr.html#android.R.attr.verticalCorrection" class="hiddenlink" target="rightframe">verticalCorrection</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.verticalGap" class="hiddenlink" target="rightframe">verticalGap</A>
+</nobr><br>
+<nobr><A HREF="android.R.string.html#android.R.string.VideoView_error_text_invalid_progressive_playback" class="hiddenlink" target="rightframe">VideoView_error_text_invalid_progressive_playback</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.voiceLanguage" class="hiddenlink" target="rightframe">voiceLanguage</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.voiceLanguageModel" class="hiddenlink" target="rightframe">voiceLanguageModel</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.voiceMaxResults" class="hiddenlink" target="rightframe">voiceMaxResults</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.voicePromptText" class="hiddenlink" target="rightframe">voicePromptText</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.voiceSearchMode" class="hiddenlink" target="rightframe">voiceSearchMode</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.VOLUME_NOTIFICATION" class="hiddenlink" target="rightframe">VOLUME_NOTIFICATION</A>
+</nobr><br>
+<A NAME="W"></A>
+<br><font size="+2">W</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.R.style.html#android.R.style.Widget_KeyboardView" class="hiddenlink" target="rightframe">Widget_KeyboardView</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_MAX_DHCP_RETRY_COUNT" class="hiddenlink" target="rightframe">WIFI_MAX_DHCP_RETRY_COUNT</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS" class="hiddenlink" target="rightframe">WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS</A>
+</nobr><br>
+<nobr><A HREF="android.net.wifi.WifiManager.html#android.net.wifi.WifiManager.WIFI_MODE_FULL" class="hiddenlink" target="rightframe">WIFI_MODE_FULL</A>
+</nobr><br>
+<nobr><A HREF="android.net.wifi.WifiManager.html#android.net.wifi.WifiManager.WIFI_MODE_SCAN_ONLY" class="hiddenlink" target="rightframe">WIFI_MODE_SCAN_ONLY</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON" class="hiddenlink" target="rightframe">WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY" class="hiddenlink" target="rightframe">WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_NUM_OPEN_NETWORKS_KEPT" class="hiddenlink" target="rightframe">WIFI_NUM_OPEN_NETWORKS_KEPT</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_ON" class="hiddenlink" target="rightframe">WIFI_ON</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_SLEEP_POLICY" class="hiddenlink" target="rightframe">WIFI_SLEEP_POLICY</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_SLEEP_POLICY_DEFAULT" class="hiddenlink" target="rightframe">WIFI_SLEEP_POLICY_DEFAULT</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_SLEEP_POLICY_NEVER" class="hiddenlink" target="rightframe">WIFI_SLEEP_POLICY_NEVER</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_SLEEP_POLICY_NEVER_WHILE_PLUGGED" class="hiddenlink" target="rightframe">WIFI_SLEEP_POLICY_NEVER_WHILE_PLUGGED</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_WATCHDOG_ACCEPTABLE_PACKET_LOSS_PERCENTAGE" class="hiddenlink" target="rightframe">WIFI_WATCHDOG_ACCEPTABLE_PACKET_LOSS_PERCENTAGE</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_WATCHDOG_AP_COUNT" class="hiddenlink" target="rightframe">WIFI_WATCHDOG_AP_COUNT</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_WATCHDOG_BACKGROUND_CHECK_DELAY_MS" class="hiddenlink" target="rightframe">WIFI_WATCHDOG_BACKGROUND_CHECK_DELAY_MS</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_WATCHDOG_BACKGROUND_CHECK_ENABLED" class="hiddenlink" target="rightframe">WIFI_WATCHDOG_BACKGROUND_CHECK_ENABLED</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_WATCHDOG_BACKGROUND_CHECK_TIMEOUT_MS" class="hiddenlink" target="rightframe">WIFI_WATCHDOG_BACKGROUND_CHECK_TIMEOUT_MS</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_WATCHDOG_INITIAL_IGNORED_PING_COUNT" class="hiddenlink" target="rightframe">WIFI_WATCHDOG_INITIAL_IGNORED_PING_COUNT</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_WATCHDOG_MAX_AP_CHECKS" class="hiddenlink" target="rightframe">WIFI_WATCHDOG_MAX_AP_CHECKS</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_WATCHDOG_ON" class="hiddenlink" target="rightframe">WIFI_WATCHDOG_ON</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_WATCHDOG_PING_COUNT" class="hiddenlink" target="rightframe">WIFI_WATCHDOG_PING_COUNT</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_WATCHDOG_PING_DELAY_MS" class="hiddenlink" target="rightframe">WIFI_WATCHDOG_PING_DELAY_MS</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_WATCHDOG_PING_TIMEOUT_MS" class="hiddenlink" target="rightframe">WIFI_WATCHDOG_PING_TIMEOUT_MS</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.windowDisablePreview" class="hiddenlink" target="rightframe">windowDisablePreview</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.windowNoDisplay" class="hiddenlink" target="rightframe">windowNoDisplay</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.windowSoftInputMode" class="hiddenlink" target="rightframe">windowSoftInputMode</A>
+</nobr><br>
+<nobr><A HREF="android.Manifest.permission.html#android.Manifest.permission.WRITE_SECURE_SETTINGS" class="hiddenlink" target="rightframe">WRITE_SECURE_SETTINGS</A>
+</nobr><br>
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/fields_index_changes.html b/docs/html/sdk/api_diff/3/changes/fields_index_changes.html
new file mode 100644
index 000000000000..3f5dd5a9b775
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/fields_index_changes.html
@@ -0,0 +1,471 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+Field Changes Index
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY class="gc-documentation">
+<a NAME="topheader"></a>
+<table summary="Index for Fields" width="100%" class="jdiffIndex" border="0" cellspacing="0" cellpadding="0" style="padding-bottom:0;margin-bottom:0;">
+  <tr>
+  <th class="indexHeader">
+    Filter the Index:
+  </th>
+  </tr>
+  <tr>
+  <td class="indexText" style="line-height:1.3em;padding-left:2em;">
+<a href="fields_index_all.html" class="staysblack">All Fields</a>
+  <br>
+<A HREF="fields_index_removals.html" xclass="hiddenlink">Removals</A>
+  <br>
+<A HREF="fields_index_additions.html"xclass="hiddenlink">Additions</A>
+  <br>
+<b>Changes</b>
+  </td>
+  </tr>
+</table>
+<div id="indexTableCaption">
+<font size="-2"><strong>Bold</strong>&nbsp;indicates&nbsp;New;&nbsp;<strike>Strike</strike>&nbsp;indicates&nbsp;deleted. Plain indicates changed.</font>
+</div>
+<A NAME="A"></A>
+<br><font size="+2">A</font>&nbsp;
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.ADB_ENABLED" class="hiddenlink" target="rightframe">ADB_ENABLED</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.ANDROID_ID" class="hiddenlink" target="rightframe">ANDROID_ID</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.autoText" class="hiddenlink" target="rightframe">autoText</A>
+</nobr><br>
+<A NAME="B"></A>
+<br><font size="+2">B</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.BLUETOOTH_ON" class="hiddenlink" target="rightframe">BLUETOOTH_ON</A>
+</nobr><br>
+<nobr><A HREF="android.content.DialogInterface.html#android.content.DialogInterface.BUTTON1" class="hiddenlink" target="rightframe">BUTTON1</A>
+</nobr><br>
+<nobr><A HREF="android.content.DialogInterface.html#android.content.DialogInterface.BUTTON2" class="hiddenlink" target="rightframe">BUTTON2</A>
+</nobr><br>
+<nobr><A HREF="android.content.DialogInterface.html#android.content.DialogInterface.BUTTON3" class="hiddenlink" target="rightframe">BUTTON3</A>
+</nobr><br>
+<A NAME="C"></A>
+<br><font size="+2">C</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.R.attr.html#android.R.attr.capitalize" class="hiddenlink" target="rightframe">capitalize</A>
+</nobr><br>
+<A NAME="D"></A>
+<br><font size="+2">D</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.DATA_ROAMING" class="hiddenlink" target="rightframe">DATA_ROAMING</A>
+</nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.DATA_X" class="hiddenlink" target="rightframe">DATA_X</A>
+</nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.DATA_Y" class="hiddenlink" target="rightframe">DATA_Y</A>
+</nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.DATA_Z" class="hiddenlink" target="rightframe">DATA_Z</A>
+</nobr><br>
+<i>DEFAULT_SORT_ORDER</i><br>
+&nbsp;in&nbsp;
+<nobr><A HREF="android.provider.MediaStore.Images.Media.html#android.provider.MediaStore.Images.Media.DEFAULT_SORT_ORDER" class="hiddenlink" target="rightframe">android.provider.MediaStore.Images.Media</A>
+</nobr><br>
+&nbsp;in&nbsp;
+<nobr><A HREF="android.provider.MediaStore.Video.html#android.provider.MediaStore.Video.DEFAULT_SORT_ORDER" class="hiddenlink" target="rightframe">android.provider.MediaStore.Video</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.DEVICE_PROVISIONED" class="hiddenlink" target="rightframe">DEVICE_PROVISIONED</A>
+</nobr><br>
+<A NAME="E"></A>
+<br><font size="+2">E</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.R.attr.html#android.R.attr.editable" class="hiddenlink" target="rightframe">editable</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.enabled" class="hiddenlink" target="rightframe">enabled</A>
+</nobr><br>
+<A NAME="H"></A>
+<br><font size="+2">H</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.HTTP_PROXY" class="hiddenlink" target="rightframe">HTTP_PROXY</A>
+</nobr><br>
+<A NAME="I"></A>
+<br><font size="+2">I</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.R.attr.html#android.R.attr.inputMethod" class="hiddenlink" target="rightframe">inputMethod</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.INSTALL_NON_MARKET_APPS" class="hiddenlink" target="rightframe">INSTALL_NON_MARKET_APPS</A>
+</nobr><br>
+<A NAME="L"></A>
+<br><font size="+2">L</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.LIGHT_NO_MOON" class="hiddenlink" target="rightframe">LIGHT_NO_MOON</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.LOCATION_PROVIDERS_ALLOWED" class="hiddenlink" target="rightframe">LOCATION_PROVIDERS_ALLOWED</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.LOGGING_ID" class="hiddenlink" target="rightframe">LOGGING_ID</A>
+</nobr><br>
+<A NAME="M"></A>
+<br><font size="+2">M</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.MAX_KEYCODE" class="hiddenlink" target="rightframe">MAX_KEYCODE</A>
+</nobr><br>
+<A NAME="N"></A>
+<br><font size="+2">N</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.NETWORK_PREFERENCE" class="hiddenlink" target="rightframe">NETWORK_PREFERENCE</A>
+</nobr><br>
+<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.NUM_STREAMS" class="hiddenlink" target="rightframe">NUM_STREAMS</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.numeric" class="hiddenlink" target="rightframe">numeric</A>
+</nobr><br>
+<A NAME="P"></A>
+<br><font size="+2">P</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.PARENTAL_CONTROL_ENABLED" class="hiddenlink" target="rightframe">PARENTAL_CONTROL_ENABLED</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.PARENTAL_CONTROL_LAST_UPDATE" class="hiddenlink" target="rightframe">PARENTAL_CONTROL_LAST_UPDATE</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.PARENTAL_CONTROL_REDIRECT_URL" class="hiddenlink" target="rightframe">PARENTAL_CONTROL_REDIRECT_URL</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.password" class="hiddenlink" target="rightframe">password</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.phoneNumber" class="hiddenlink" target="rightframe">phoneNumber</A>
+</nobr><br>
+<A NAME="R"></A>
+<br><font size="+2">R</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.RAW_DATA_INDEX" class="hiddenlink" target="rightframe">RAW_DATA_INDEX</A>
+</nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.RAW_DATA_X" class="hiddenlink" target="rightframe">RAW_DATA_X</A>
+</nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.RAW_DATA_Y" class="hiddenlink" target="rightframe">RAW_DATA_Y</A>
+</nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.RAW_DATA_Z" class="hiddenlink" target="rightframe">RAW_DATA_Z</A>
+</nobr><br>
+<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.ROUTE_BLUETOOTH" class="hiddenlink" target="rightframe">ROUTE_BLUETOOTH</A>
+</nobr><br>
+<A NAME="S"></A>
+<br><font size="+2">S</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.R.attr.html#android.R.attr.searchButtonText" class="hiddenlink" target="rightframe">searchButtonText</A>
+</nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.SENSOR_ACCELEROMETER" class="hiddenlink" target="rightframe">SENSOR_ACCELEROMETER</A>
+</nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.SENSOR_ALL" class="hiddenlink" target="rightframe">SENSOR_ALL</A>
+</nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.SENSOR_LIGHT" class="hiddenlink" target="rightframe">SENSOR_LIGHT</A>
+</nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.SENSOR_MAGNETIC_FIELD" class="hiddenlink" target="rightframe">SENSOR_MAGNETIC_FIELD</A>
+</nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.SENSOR_MAX" class="hiddenlink" target="rightframe">SENSOR_MAX</A>
+</nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.SENSOR_MIN" class="hiddenlink" target="rightframe">SENSOR_MIN</A>
+</nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.SENSOR_ORIENTATION" class="hiddenlink" target="rightframe">SENSOR_ORIENTATION</A>
+</nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.SENSOR_ORIENTATION_RAW" class="hiddenlink" target="rightframe">SENSOR_ORIENTATION_RAW</A>
+</nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.SENSOR_PROXIMITY" class="hiddenlink" target="rightframe">SENSOR_PROXIMITY</A>
+</nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.SENSOR_TEMPERATURE" class="hiddenlink" target="rightframe">SENSOR_TEMPERATURE</A>
+</nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.SENSOR_TRICORDER" class="hiddenlink" target="rightframe">SENSOR_TRICORDER</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.SETTINGS_CLASSNAME" class="hiddenlink" target="rightframe">SETTINGS_CLASSNAME</A>
+</nobr><br>
+<nobr><A HREF="android.R.attr.html#android.R.attr.singleLine" class="hiddenlink" target="rightframe">singleLine</A>
+</nobr><br>
+<A NAME="U"></A>
+<br><font size="+2">U</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.USB_MASS_STORAGE_ENABLED" class="hiddenlink" target="rightframe">USB_MASS_STORAGE_ENABLED</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.USE_GOOGLE_MAIL" class="hiddenlink" target="rightframe">USE_GOOGLE_MAIL</A>
+</nobr><br>
+<A NAME="W"></A>
+<br><font size="+2">W</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON" class="hiddenlink" target="rightframe">WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY" class="hiddenlink" target="rightframe">WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_NUM_OPEN_NETWORKS_KEPT" class="hiddenlink" target="rightframe">WIFI_NUM_OPEN_NETWORKS_KEPT</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_ON" class="hiddenlink" target="rightframe">WIFI_ON</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_WATCHDOG_ACCEPTABLE_PACKET_LOSS_PERCENTAGE" class="hiddenlink" target="rightframe">WIFI_WATCHDOG_ACCEPTABLE_PACKET_LOSS_PERCENTAGE</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_WATCHDOG_AP_COUNT" class="hiddenlink" target="rightframe">WIFI_WATCHDOG_AP_COUNT</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_WATCHDOG_BACKGROUND_CHECK_DELAY_MS" class="hiddenlink" target="rightframe">WIFI_WATCHDOG_BACKGROUND_CHECK_DELAY_MS</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_WATCHDOG_BACKGROUND_CHECK_ENABLED" class="hiddenlink" target="rightframe">WIFI_WATCHDOG_BACKGROUND_CHECK_ENABLED</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_WATCHDOG_BACKGROUND_CHECK_TIMEOUT_MS" class="hiddenlink" target="rightframe">WIFI_WATCHDOG_BACKGROUND_CHECK_TIMEOUT_MS</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_WATCHDOG_INITIAL_IGNORED_PING_COUNT" class="hiddenlink" target="rightframe">WIFI_WATCHDOG_INITIAL_IGNORED_PING_COUNT</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_WATCHDOG_MAX_AP_CHECKS" class="hiddenlink" target="rightframe">WIFI_WATCHDOG_MAX_AP_CHECKS</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_WATCHDOG_ON" class="hiddenlink" target="rightframe">WIFI_WATCHDOG_ON</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_WATCHDOG_PING_COUNT" class="hiddenlink" target="rightframe">WIFI_WATCHDOG_PING_COUNT</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_WATCHDOG_PING_DELAY_MS" class="hiddenlink" target="rightframe">WIFI_WATCHDOG_PING_DELAY_MS</A>
+</nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.WIFI_WATCHDOG_PING_TIMEOUT_MS" class="hiddenlink" target="rightframe">WIFI_WATCHDOG_PING_TIMEOUT_MS</A>
+</nobr><br>
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/fields_index_removals.html b/docs/html/sdk/api_diff/3/changes/fields_index_removals.html
new file mode 100644
index 000000000000..58ad6557e1eb
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/fields_index_removals.html
@@ -0,0 +1,68 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+Field Removals Index
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY class="gc-documentation">
+<a NAME="topheader"></a>
+<table summary="Index for Fields" width="100%" class="jdiffIndex" border="0" cellspacing="0" cellpadding="0" style="padding-bottom:0;margin-bottom:0;">
+  <tr>
+  <th class="indexHeader">
+    Filter the Index:
+  </th>
+  </tr>
+  <tr>
+  <td class="indexText" style="line-height:1.3em;padding-left:2em;">
+<a href="fields_index_all.html" class="staysblack">All Fields</a>
+  <br>
+<b>Removals</b>
+  <br>
+<A HREF="fields_index_additions.html"xclass="hiddenlink">Additions</A>
+  <br>
+<A HREF="fields_index_changes.html"xclass="hiddenlink">Changes</A>
+  </td>
+  </tr>
+</table>
+<div id="indexTableCaption">
+<font size="-2"><strong>Bold</strong>&nbsp;indicates&nbsp;New;&nbsp;<strike>Strike</strike>&nbsp;indicates&nbsp;deleted. Plain indicates changed.</font>
+</div>
+<A NAME="C"></A>
+<br><font size="+2">C</font>&nbsp;
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.content.Intent.html#android.content.Intent.CATEGORY_GADGET" class="hiddenlink" target="rightframe"><strike>CATEGORY_GADGET</strike></A>
+</nobr><br>
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/java.lang.Character.UnicodeBlock.html b/docs/html/sdk/api_diff/3/changes/java.lang.Character.UnicodeBlock.html
new file mode 100644
index 000000000000..f7c9d8f64068
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/java.lang.Character.UnicodeBlock.html
@@ -0,0 +1,126 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+java.lang.Character.UnicodeBlock
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class java.lang.<A HREF="../../../../reference/java/lang/Character.UnicodeBlock.html" target="_top"><font size="+3"><tt>Character.UnicodeBlock</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=3>Changed Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="java.lang.Character.UnicodeBlock.forName_changed(java.lang.String)"></A>
+  <nobr><code>UnicodeBlock</code>&nbsp;<A HREF="../../../../reference/java/lang/Character.UnicodeBlock.html#forName(java.lang.String)" target="_top"><xfont size="+1"><tt>forName</tt></font></A>(<code>String</code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+Change from non-final to final.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/java.lang.Class.html b/docs/html/sdk/api_diff/3/changes/java.lang.Class.html
new file mode 100644
index 000000000000..fa0b05639952
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/java.lang.Class.html
@@ -0,0 +1,166 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+java.lang.Class
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class java.lang.<A HREF="../../../../reference/java/lang/Class.html" target="_top"><font size="+3"><tt>Class</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=3>Changed Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="java.lang.Class.getClasses_changed()"></A>
+  <nobr><code>Class[]</code>&nbsp;<A HREF="../../../../reference/java/lang/Class.html#getClasses()" target="_top"><xfont size="+1"><tt>getClasses</tt></font></A>()  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+Change in return type from <code>Class&lt;?&gt;</code> to <code>Class[]</code>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="java.lang.Class.getConstructors_changed()"></A>
+  <nobr><code>Constructor[]</code>&nbsp;<A HREF="../../../../reference/java/lang/Class.html#getConstructors()" target="_top"><xfont size="+1"><tt>getConstructors</tt></font></A>()  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+Change in return type from <code>Constructor&lt;T&gt;</code> to <code>Constructor[]</code>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="java.lang.Class.getDeclaredClasses_changed()"></A>
+  <nobr><code>Class[]</code>&nbsp;<A HREF="../../../../reference/java/lang/Class.html#getDeclaredClasses()" target="_top"><xfont size="+1"><tt>getDeclaredClasses</tt></font></A>()  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+Change in return type from <code>Class&lt;?&gt;</code> to <code>Class[]</code>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="java.lang.Class.getDeclaredConstructors_changed()"></A>
+  <nobr><code>Constructor[]</code>&nbsp;<A HREF="../../../../reference/java/lang/Class.html#getDeclaredConstructors()" target="_top"><xfont size="+1"><tt>getDeclaredConstructors</tt></font></A>()  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+Change in return type from <code>Constructor&lt;T&gt;</code> to <code>Constructor[]</code>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="java.lang.Class.getInterfaces_changed()"></A>
+  <nobr><code>Class[]</code>&nbsp;<A HREF="../../../../reference/java/lang/Class.html#getInterfaces()" target="_top"><xfont size="+1"><tt>getInterfaces</tt></font></A>()  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+Change in return type from <code>Class&lt;?&gt;</code> to <code>Class[]</code>.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/java.lang.String.html b/docs/html/sdk/api_diff/3/changes/java.lang.String.html
new file mode 100644
index 000000000000..5c41b8cc893e
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/java.lang.String.html
@@ -0,0 +1,161 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+java.lang.String
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class java.lang.<A HREF="../../../../reference/java/lang/String.html" target="_top"><font size="+3"><tt>String</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Constructors" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=3>Changed Constructors</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="java.lang.String.ctor_changed()"></A>
+  <nobr><A HREF="../../../../reference/java/lang/String.html#String()" target="_top"><xfont size="+1"><tt>String</tt></font></A>()  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="java.lang.String.ctor_changed(byte[])"></A>
+  <nobr><A HREF="../../../../reference/java/lang/String.html#String(byte[])" target="_top"><xfont size="+1"><tt>String</tt></font></A>(<code>byte[]</code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="java.lang.String.ctor_changed(byte[], int)"></A>
+  <nobr><A HREF="../../../../reference/java/lang/String.html#String(byte[], int)" target="_top"><xfont size="+1"><tt>String</tt></font></A>(<code>byte[],</nobr> int<nobr><nobr></code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="java.lang.String.ctor_changed(byte[], int, int)"></A>
+  <nobr><A HREF="../../../../reference/java/lang/String.html#String(byte[], int, int)" target="_top"><xfont size="+1"><tt>String</tt></font></A>(<code>byte[],</nobr> int<nobr>,</nobr> int<nobr><nobr></code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="java.lang.String.ctor_changed(byte[], int, int, int)"></A>
+  <nobr><A HREF="../../../../reference/java/lang/String.html#String(byte[], int, int, int)" target="_top"><xfont size="+1"><tt>String</tt></font></A>(<code>byte[],</nobr> int<nobr>,</nobr> int<nobr>,</nobr> int<nobr><nobr></code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="methods"></a>
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/java.lang.reflect.Proxy.html b/docs/html/sdk/api_diff/3/changes/java.lang.reflect.Proxy.html
new file mode 100644
index 000000000000..f593c0ee8e73
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/java.lang.reflect.Proxy.html
@@ -0,0 +1,126 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+java.lang.reflect.Proxy
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class java.lang.reflect.<A HREF="../../../../reference/java/lang/reflect/Proxy.html" target="_top"><font size="+3"><tt>Proxy</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=3>Changed Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="java.lang.reflect.Proxy.getProxyClass_changed(java.lang.ClassLoader, java.lang.Class<?>...)"></A>
+  <nobr><code>Class&lt;?&gt;</code>&nbsp;<A HREF="../../../../reference/java/lang/reflect/Proxy.html#getProxyClass(java.lang.ClassLoader, java.lang.Class<?>...)" target="_top"><xfont size="+1"><tt>getProxyClass</tt></font></A>(<code>ClassLoader,</nobr> Class&lt;?&gt;<nobr><nobr></code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+Change in signature from (<code>ClassLoader, </code>) to (<code>ClassLoader, Class&lt;?&gt;</code>).<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/java.net.Socket.html b/docs/html/sdk/api_diff/3/changes/java.net.Socket.html
new file mode 100644
index 000000000000..6027217d619c
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/java.net.Socket.html
@@ -0,0 +1,161 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+java.net.Socket
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class java.net.<A HREF="../../../../reference/java/net/Socket.html" target="_top"><font size="+3"><tt>Socket</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Constructors" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=3>Changed Constructors</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="java.net.Socket.ctor_changed()"></A>
+  <nobr><A HREF="../../../../reference/java/net/Socket.html#Socket()" target="_top"><xfont size="+1"><tt>Socket</tt></font></A>()  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="java.net.Socket.ctor_changed(java.lang.String, int)"></A>
+  <nobr><A HREF="../../../../reference/java/net/Socket.html#Socket(java.lang.String, int)" target="_top"><xfont size="+1"><tt>Socket</tt></font></A>(<code>String,</nobr> int<nobr><nobr></code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="java.net.Socket.ctor_changed(java.lang.String, int, java.net.InetAddress, int)"></A>
+  <nobr><A HREF="../../../../reference/java/net/Socket.html#Socket(java.lang.String, int, java.net.InetAddress, int)" target="_top"><xfont size="+1"><tt>Socket</tt></font></A>(<code>String,</nobr> int<nobr>,</nobr> InetAddress<nobr>,</nobr> int<nobr><nobr></code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="java.net.Socket.ctor_changed(java.net.Proxy)"></A>
+  <nobr><A HREF="../../../../reference/java/net/Socket.html#Socket(java.net.Proxy)" target="_top"><xfont size="+1"><tt>Socket</tt></font></A>(<code>Proxy</code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="java.net.Socket.ctor_changed(java.net.SocketImpl)"></A>
+  <nobr><A HREF="../../../../reference/java/net/Socket.html#Socket(java.net.SocketImpl)" target="_top"><xfont size="+1"><tt>Socket</tt></font></A>(<code>SocketImpl</code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="methods"></a>
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/java.util.Date.html b/docs/html/sdk/api_diff/3/changes/java.util.Date.html
new file mode 100644
index 000000000000..6a8dd2685635
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/java.util.Date.html
@@ -0,0 +1,134 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+java.util.Date
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class java.util.<A HREF="../../../../reference/java/util/Date.html" target="_top"><font size="+3"><tt>Date</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Constructors" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=3>Changed Constructors</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="java.util.Date.ctor_changed()"></A>
+  <nobr><A HREF="../../../../reference/java/util/Date.html#Date()" target="_top"><xfont size="+1"><tt>Date</tt></font></A>()  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="java.util.Date.ctor_changed(int, int, int, int, int, int)"></A>
+  <nobr><A HREF="../../../../reference/java/util/Date.html#Date(int, int, int, int, int, int)" target="_top"><xfont size="+1"><tt>Date</tt></font></A>(<code>int,</nobr> int<nobr>,</nobr> int<nobr>,</nobr> int<nobr>,</nobr> int<nobr>,</nobr> int<nobr><nobr></code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="methods"></a>
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/java.util.jar.Pack200.Packer.html b/docs/html/sdk/api_diff/3/changes/java.util.jar.Pack200.Packer.html
new file mode 100644
index 000000000000..75b4cbc4a8f8
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/java.util.jar.Pack200.Packer.html
@@ -0,0 +1,130 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+java.util.jar.Pack200.Packer
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Interface java.util.jar.<A HREF="../../../../reference/java/util/jar/Pack200.Packer.html" target="_top"><font size="+3"><tt>Pack200.Packer</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="java.util.jar.Pack200.Packer.addPropertyChangeListener_added(java.beans.PropertyChangeListener)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/java/util/jar/Pack200.Packer.html#addPropertyChangeListener(java.beans.PropertyChangeListener)" target="_top"><xfont size="+1"><tt>addPropertyChangeListener</tt></font></A>(<code>PropertyChangeListener</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="java.util.jar.Pack200.Packer.removePropertyChangeListener_added(java.beans.PropertyChangeListener)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/java/util/jar/Pack200.Packer.html#removePropertyChangeListener(java.beans.PropertyChangeListener)" target="_top"><xfont size="+1"><tt>removePropertyChangeListener</tt></font></A>(<code>PropertyChangeListener</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/java.util.jar.Pack200.Unpacker.html b/docs/html/sdk/api_diff/3/changes/java.util.jar.Pack200.Unpacker.html
new file mode 100644
index 000000000000..382fdea8428e
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/java.util.jar.Pack200.Unpacker.html
@@ -0,0 +1,130 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+java.util.jar.Pack200.Unpacker
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Interface java.util.jar.<A HREF="../../../../reference/java/util/jar/Pack200.Unpacker.html" target="_top"><font size="+3"><tt>Pack200.Unpacker</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="java.util.jar.Pack200.Unpacker.addPropertyChangeListener_added(java.beans.PropertyChangeListener)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/java/util/jar/Pack200.Unpacker.html#addPropertyChangeListener(java.beans.PropertyChangeListener)" target="_top"><xfont size="+1"><tt>addPropertyChangeListener</tt></font></A>(<code>PropertyChangeListener</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="java.util.jar.Pack200.Unpacker.removePropertyChangeListener_added(java.beans.PropertyChangeListener)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/java/util/jar/Pack200.Unpacker.html#removePropertyChangeListener(java.beans.PropertyChangeListener)" target="_top"><xfont size="+1"><tt>removePropertyChangeListener</tt></font></A>(<code>PropertyChangeListener</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/java.util.logging.Level.html b/docs/html/sdk/api_diff/3/changes/java.util.logging.Level.html
new file mode 100644
index 000000000000..7f5fd19782c8
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/java.util.logging.Level.html
@@ -0,0 +1,127 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+java.util.logging.Level
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class java.util.logging.<A HREF="../../../../reference/java/util/logging/Level.html" target="_top"><font size="+3"><tt>Level</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=3>Changed Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="java.util.logging.Level.parse_changed(java.lang.String)"></A>
+  <nobr><code>Level</code>&nbsp;<A HREF="../../../../reference/java/util/logging/Level.html#parse(java.lang.String)" target="_top"><xfont size="+1"><tt>parse</tt></font></A>(<code>String</code>)  </nobr>
+  </TD>
+  <TD VALIGN="TOP" WIDTH="30%">
+Change in exceptions thrown from no exceptions to <code>java.lang.IllegalArgumentException</code>.<br>
+ Change from final to non-final.<br>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/java.util.logging.LogManager.html b/docs/html/sdk/api_diff/3/changes/java.util.logging.LogManager.html
new file mode 100644
index 000000000000..d259077f26d9
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/java.util.logging.LogManager.html
@@ -0,0 +1,137 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+java.util.logging.LogManager
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Class java.util.logging.<A HREF="../../../../reference/java/util/logging/LogManager.html" target="_top"><font size="+3"><tt>LogManager</tt></font></A>
+</H2>
+<a NAME="constructors"></a>
+<a NAME="methods"></a>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Methods" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Methods</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="java.util.logging.LogManager.addPropertyChangeListener_added(java.beans.PropertyChangeListener)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/java/util/logging/LogManager.html#addPropertyChangeListener(java.beans.PropertyChangeListener)" target="_top"><xfont size="+1"><tt>addPropertyChangeListener</tt></font></A>(<code>PropertyChangeListener</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="java.util.logging.LogManager.getLoggingMXBean_added()"></A>
+  <nobr><code>LoggingMXBean</code>&nbsp;<A HREF="../../../../reference/java/util/logging/LogManager.html#getLoggingMXBean()" target="_top"><xfont size="+1"><tt>getLoggingMXBean</tt></font></A>()</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="java.util.logging.LogManager.removePropertyChangeListener_added(java.beans.PropertyChangeListener)"></A>
+  <nobr><code>void</code>&nbsp;<A HREF="../../../../reference/java/util/logging/LogManager.html#removePropertyChangeListener(java.beans.PropertyChangeListener)" target="_top"><xfont size="+1"><tt>removePropertyChangeListener</tt></font></A>(<code>PropertyChangeListener</code>)</nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<a NAME="fields"></a>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/jdiff_help.html b/docs/html/sdk/api_diff/3/changes/jdiff_help.html
new file mode 100644
index 000000000000..21a59f92d526
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/jdiff_help.html
@@ -0,0 +1,135 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+JDiff Help
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<TABLE summary="Navigation bar" BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+  <TABLE summary="Navigation bar" BORDER="0" CELLPADDING="0" CELLSPACING="3">
+    <TR ALIGN="center" VALIGN="top">
+      <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../reference/index.html" target="_top"><FONT CLASS="NavBarFont1"><B><tt>3</tt></B></FONT></A>&nbsp;</TD>
+      <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="changes-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
+      <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> &nbsp;<FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
+      <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1"> &nbsp;<FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
+      <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="jdiff_statistics.html"><FONT CLASS="NavBarFont1"><B>Statistics</B></FONT></A>&nbsp;</TD>
+      <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Help</B></FONT>&nbsp;</TD>
+    </TR>
+  </TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM><b>Generated by<br><a href="http://www.jdiff.org" class="staysblack" target="_top">JDiff</a></b></EM></TD>
+</TR>
+<TR>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell2"><FONT SIZE="-2"></FONT>
+</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../changes.html" TARGET="_top"><B>FRAMES</B></A>  &nbsp;
+  &nbsp;<A HREF="jdiff_help.html" TARGET="_top"><B>NO FRAMES</B></A></FONT></TD>
+</TR>
+</TABLE>
+<HR>
+<!-- End of nav bar -->
+<center>
+<H1>JDiff Documentation</H1>
+</center>
+<BLOCKQUOTE>
+JDiff is a <a href="http://java.sun.com/j2se/javadoc/" target="_top">Javadoc</a> doclet which generates a report of the API differences between two versions of a product. It does not report changes in Javadoc comments, or changes in what a class or method does. 
+This help page describes the different parts of the output from JDiff.
+</BLOCKQUOTE>
+<BLOCKQUOTE>
+ See the reference page in the <a href="http://www.jdiff.org">source for JDiff</a> for information about how to generate a report like this one.
+</BLOCKQUOTE>
+<BLOCKQUOTE>
+The indexes shown in the top-left frame help show each type of change in more detail. The index "All Differences" contains all the differences between the APIs, in alphabetical order. 
+These indexes all use the same format:
+<ul>
+<li>Removed packages, classes, constructors, methods and fields are <strike>struck through</strike>.</li>
+<li>Added packages, classes, constructors, methods and fields appear in <b>bold</b>.</li>
+<li>Changed packages, classes, constructors, methods and fields appear in normal text.</li>
+</ul>
+</BLOCKQUOTE>
+<BLOCKQUOTE>
+You can always tell when you are reading a JDiff page, rather than a Javadoc page, by the color of the index bar and the color of the background. 
+Links which take you to a Javadoc page are always in a <tt>typewriter</tt> font. 
+Just like Javadoc, all interface names are in <i>italic</i>, and class names are not italicized. Where there are multiple entries in an index with the same name, the heading for them is also in italics, but is not a link.
+</BLOCKQUOTE>
+<BLOCKQUOTE>
+<H3><b><tt>Javadoc</tt></b></H3>
+This is a link to the <a href="../../../../reference/index.html" target="_top">top-level</a> Javadoc page for the new version of the product.
+</BLOCKQUOTE>
+<BLOCKQUOTE>
+<H3>Overview</H3>
+The <a href="changes-summary.html">overview</a> is the top-level summary of what was removed, added and changed between versions.
+</BLOCKQUOTE>
+<BLOCKQUOTE>
+<H3>Package</H3>
+This is a link to the package containing the current changed class or interface.
+</BLOCKQUOTE>
+<BLOCKQUOTE>
+<H3>Class</H3>
+This is highlighted when you are looking at the changed class or interface.
+</BLOCKQUOTE>
+<BLOCKQUOTE>
+<H3>Text Changes</H3>
+This is a link to the top-level index of all documentation changes for the current package or class. 
+If it is not present, then there are no documentation changes for the current package or class. 
+This link can be removed entirely by not using the <code>-docchanges</code> option.
+</BLOCKQUOTE>
+<BLOCKQUOTE>
+<H3>Statistics</H3>
+This is a link to a page which shows statistics about the changes between the two APIs.
+This link can be removed entirely by not using the <code>-stats</code> option.
+</BLOCKQUOTE>
+<BLOCKQUOTE>
+<H3>Help</H3>
+A link to this Help page for JDiff.
+</BLOCKQUOTE>
+<BLOCKQUOTE>
+<H3>Prev/Next</H3>
+These links take you to the previous  and next changed package or class.
+</BLOCKQUOTE>
+<BLOCKQUOTE>
+<H3>Frames/No Frames</H3>
+These links show and hide the HTML frames. All pages are available with or without frames.
+</BLOCKQUOTE>
+<BLOCKQUOTE>
+<H2>Complex Changes</H2>
+There are some complex changes which can occur between versions, for example, when two or more methods with the same name change simultaneously, or when a method or field is moved into or from a superclass. 
+In these cases, the change will be seen as a removal and an addition, rather than as a change. Unexpected removals or additions are often part of one of these type of changes. 
+</BLOCKQUOTE>
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/jdiff_statistics.html b/docs/html/sdk/api_diff/3/changes/jdiff_statistics.html
new file mode 100644
index 000000000000..6faea52ee8f0
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/jdiff_statistics.html
@@ -0,0 +1,1284 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+API Change Statistics
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<body class="gc-documentation">
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;xborder-bottom:none;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Version:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Version:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="../changes.html" target="_top">Top of Report</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<h1>API&nbsp;Change&nbsp;Statistics</h1>
+<p>
+The percent change statistic reported for all elements in the &quot;to&quot; API Level specification is defined recursively as follows:</p>
+<pre>
+Percentage difference = 100 * (added + removed + 2*changed)
+                        -----------------------------------
+                        sum of public elements in BOTH APIs
+</pre>
+<p>where <code>added</code> is the number of packages added, <code>removed</code> is the number of packages removed, and <code>changed</code> is the number of packages changed.
+This definition is applied recursively for the classes and their program elements, so the value for a changed package will be less than 1, unless every class in that package has changed.
+The definition ensures that if all packages are removed and all new packages are
+added, the change will be 100%. Values are rounded here, so a value of 0% indicates a percentage difference of less than 0.5%.</p>
+<p>The overall difference between the two APIs is approximately <span style="color:222;font-weight:bold;">4%</span>.
+</p>
+<br><h2>Contents</h2>
+<dl><dt><a href="#packages">Changed Packages</a></dt> <dd>Sorted by percentage difference</dd>
+<dt><a href="#classes">Changed Classes and <i>Interfaces</i></a></dt><dd>Sorted by percentage difference</dd>
+<dt><a href="#numbers">Total of Differences</a></dt><dd>Listed by number and type</dd></dl>
+<br>
+<a name="packages"></a>
+<h2>Changed Packages, Sorted by Percentage Difference</h2>
+<TABLE summary="Packages sorted by percentage difference" WIDTH="100%">
+<TR>
+  <TH  WIDTH="10%">Percentage Difference</TH>
+  <TH>Package</TH>
+</TR>
+<TR>
+  <TD ALIGN="center">33</TD>
+  <TD><A HREF="pkg_android.opengl.html">android.opengl</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">27</TD>
+  <TD><A HREF="pkg_android.media.html">android.media</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">24</TD>
+  <TD><A HREF="pkg_android.text.style.html">android.text.style</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">22</TD>
+  <TD><A HREF="pkg_android.hardware.html">android.hardware</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">22</TD>
+  <TD><A HREF="pkg_android.location.html">android.location</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">13</TD>
+  <TD><A HREF="pkg_android.content.res.html">android.content.res</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">12</TD>
+  <TD><A HREF="pkg_dalvik.system.html">dalvik.system</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">9</TD>
+  <TD><A HREF="pkg_android.telephony.html">android.telephony</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">9</TD>
+  <TD><A HREF="pkg_android.text.method.html">android.text.method</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">8</TD>
+  <TD><A HREF="pkg_android.app.html">android.app</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">8</TD>
+  <TD><A HREF="pkg_android.test.html">android.test</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">8</TD>
+  <TD><A HREF="pkg_android.test.suitebuilder.html">android.test.suitebuilder</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">7</TD>
+  <TD><A HREF="pkg_android.html">android</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">7</TD>
+  <TD><A HREF="pkg_android.text.html">android.text</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">6</TD>
+  <TD><A HREF="pkg_android.provider.html">android.provider</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">6</TD>
+  <TD><A HREF="pkg_android.view.html">android.view</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">5</TD>
+  <TD><A HREF="pkg_android.widget.html">android.widget</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">5</TD>
+  <TD><A HREF="pkg_android.os.html">android.os</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">4</TD>
+  <TD><A HREF="pkg_android.webkit.html">android.webkit</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">3</TD>
+  <TD><A HREF="pkg_android.content.pm.html">android.content.pm</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">2</TD>
+  <TD><A HREF="pkg_android.util.html">android.util</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">1</TD>
+  <TD><A HREF="pkg_android.content.html">android.content</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">1</TD>
+  <TD><A HREF="pkg_java.util.jar.html">java.util.jar</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">1</TD>
+  <TD><A HREF="pkg_android.graphics.drawable.shapes.html">android.graphics.drawable.shapes</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">&lt;1</TD>
+  <TD><A HREF="pkg_android.net.html">android.net</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">&lt;1</TD>
+  <TD><A HREF="pkg_android.graphics.drawable.html">android.graphics.drawable</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">&lt;1</TD>
+  <TD><A HREF="pkg_java.util.logging.html">java.util.logging</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">&lt;1</TD>
+  <TD><A HREF="pkg_android.test.mock.html">android.test.mock</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">&lt;1</TD>
+  <TD><A HREF="pkg_java.lang.reflect.html">java.lang.reflect</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">&lt;1</TD>
+  <TD><A HREF="pkg_android.view.animation.html">android.view.animation</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">&lt;1</TD>
+  <TD><A HREF="pkg_android.net.wifi.html">android.net.wifi</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">&lt;1</TD>
+  <TD><A HREF="pkg_android.telephony.gsm.html">android.telephony.gsm</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">&lt;1</TD>
+  <TD><A HREF="pkg_java.net.html">java.net</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">&lt;1</TD>
+  <TD><A HREF="pkg_android.database.html">android.database</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">&lt;1</TD>
+  <TD><A HREF="pkg_android.graphics.html">android.graphics</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">&lt;1</TD>
+  <TD><A HREF="pkg_java.lang.html">java.lang</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">&lt;1</TD>
+  <TD><A HREF="pkg_android.database.sqlite.html">android.database.sqlite</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">&lt;1</TD>
+  <TD><A HREF="pkg_android.preference.html">android.preference</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">&lt;1</TD>
+  <TD><A HREF="pkg_java.util.html">java.util</A></TD>
+</TR>
+</TABLE>
+<br>
+<a name="classes"></a>
+<h2>Changed Classes and <i>Interfaces</i>, Sorted by Percentage Difference</h2>
+<TABLE summary="Classes sorted by percentage difference" WIDTH="100%">
+<TR WIDTH="20%">
+  <TH WIDTH="10%"><b>Percentage<br>Difference</b></TH>
+  <TH><b>Class or <i>Interface</i></b></TH>
+</TR>
+<TR>
+  <TD ALIGN="center">84</TD>
+  <TD><A HREF="android.test.TouchUtils.html">
+android.test.TouchUtils</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">81</TD>
+  <TD><A HREF="dalvik.system.Zygote.html">
+dalvik.system.Zygote</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">66</TD>
+  <TD><A HREF="android.webkit.UrlInterceptHandler.html">
+<i>android.webkit.UrlInterceptHandler</i></A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">61</TD>
+  <TD><A HREF="android.provider.MediaStore.html">
+android.provider.MediaStore</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">53</TD>
+  <TD><A HREF="android.view.GestureDetector.html">
+android.view.GestureDetector</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">50</TD>
+  <TD><A HREF="android.app.LauncherActivity.html">
+android.app.LauncherActivity</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">50</TD>
+  <TD><A HREF="android.text.style.AlignmentSpan.Standard.html">
+android.text.style.AlignmentSpan.Standard</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">50</TD>
+  <TD><A HREF="android.text.style.StrikethroughSpan.html">
+android.text.style.StrikethroughSpan</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">50</TD>
+  <TD><A HREF="android.text.style.UnderlineSpan.html">
+android.text.style.UnderlineSpan</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">50</TD>
+  <TD><A HREF="android.widget.PopupWindow.OnDismissListener.html">
+<i>android.widget.PopupWindow.OnDismissListener</i></A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">48</TD>
+  <TD><A HREF="android.app.AlertDialog.html">
+android.app.AlertDialog</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">46</TD>
+  <TD><A HREF="android.content.DialogInterface.html">
+<i>android.content.DialogInterface</i></A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">45</TD>
+  <TD><A HREF="android.view.ViewConfiguration.html">
+android.view.ViewConfiguration</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">42</TD>
+  <TD><A HREF="android.text.method.KeyListener.html">
+<i>android.text.method.KeyListener</i></A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">40</TD>
+  <TD><A HREF="android.text.Annotation.html">
+android.text.Annotation</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">40</TD>
+  <TD><A HREF="android.text.style.BackgroundColorSpan.html">
+android.text.style.BackgroundColorSpan</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">40</TD>
+  <TD><A HREF="android.text.style.ForegroundColorSpan.html">
+android.text.style.ForegroundColorSpan</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">40</TD>
+  <TD><A HREF="android.text.style.SubscriptSpan.html">
+android.text.style.SubscriptSpan</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">40</TD>
+  <TD><A HREF="android.text.style.SuperscriptSpan.html">
+android.text.style.SuperscriptSpan</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">40</TD>
+  <TD><A HREF="android.text.style.URLSpan.html">
+android.text.style.URLSpan</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">39</TD>
+  <TD><A HREF="android.media.MediaRecorder.html">
+android.media.MediaRecorder</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">38</TD>
+  <TD><A HREF="android.text.style.DynamicDrawableSpan.html">
+android.text.style.DynamicDrawableSpan</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">36</TD>
+  <TD><A HREF="android.content.res.AssetFileDescriptor.html">
+android.content.res.AssetFileDescriptor</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">36</TD>
+  <TD><A HREF="android.location.LocationManager.html">
+android.location.LocationManager</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">34</TD>
+  <TD><A HREF="android.hardware.SensorManager.html">
+android.hardware.SensorManager</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">33</TD>
+  <TD><A HREF="android.text.AutoText.html">
+android.text.AutoText</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">33</TD>
+  <TD><A HREF="android.text.method.Touch.html">
+android.text.method.Touch</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">33</TD>
+  <TD><A HREF="android.text.style.AbsoluteSizeSpan.html">
+android.text.style.AbsoluteSizeSpan</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">33</TD>
+  <TD><A HREF="android.text.style.LeadingMarginSpan.Standard.html">
+android.text.style.LeadingMarginSpan.Standard</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">33</TD>
+  <TD><A HREF="android.text.style.RelativeSizeSpan.html">
+android.text.style.RelativeSizeSpan</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">33</TD>
+  <TD><A HREF="android.text.style.ScaleXSpan.html">
+android.text.style.ScaleXSpan</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">33</TD>
+  <TD><A HREF="android.text.style.StyleSpan.html">
+android.text.style.StyleSpan</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">33</TD>
+  <TD><A HREF="android.text.style.TypefaceSpan.html">
+android.text.style.TypefaceSpan</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">33</TD>
+  <TD><A HREF="android.widget.RemoteViews.ActionException.html">
+android.widget.RemoteViews.ActionException</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">31</TD>
+  <TD><A HREF="android.widget.RemoteViews.html">
+android.widget.RemoteViews</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">30</TD>
+  <TD><A HREF="android.provider.Settings.html">
+android.provider.Settings</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">28</TD>
+  <TD><A HREF="android.text.style.QuoteSpan.html">
+android.text.style.QuoteSpan</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">27</TD>
+  <TD><A HREF="android.app.AlarmManager.html">
+android.app.AlarmManager</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">26</TD>
+  <TD><A HREF="android.text.style.ImageSpan.html">
+android.text.style.ImageSpan</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">25</TD>
+  <TD><A HREF="android.hardware.SensorListener.html">
+<i>android.hardware.SensorListener</i></A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">25</TD>
+  <TD><A HREF="android.text.method.MetaKeyKeyListener.html">
+android.text.method.MetaKeyKeyListener</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">25</TD>
+  <TD><A HREF="android.text.style.BulletSpan.html">
+android.text.style.BulletSpan</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">25</TD>
+  <TD><A HREF="android.widget.ResourceCursorAdapter.html">
+android.widget.ResourceCursorAdapter</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">23</TD>
+  <TD><A HREF="android.provider.Contacts.Intents.html">
+android.provider.Contacts.Intents</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">21</TD>
+  <TD><A HREF="android.widget.PopupWindow.html">
+android.widget.PopupWindow</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">20</TD>
+  <TD><A HREF="android.R.id.html">
+android.R.id</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">20</TD>
+  <TD><A HREF="android.provider.Settings.System.html">
+android.provider.Settings.System</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">20</TD>
+  <TD><A HREF="android.app.ActivityManager.html">
+android.app.ActivityManager</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">20</TD>
+  <TD><A HREF="android.text.method.BaseKeyListener.html">
+android.text.method.BaseKeyListener</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">20</TD>
+  <TD><A HREF="android.util.TimeUtils.html">
+android.util.TimeUtils</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">20</TD>
+  <TD><A HREF="android.widget.AutoCompleteTextView.html">
+android.widget.AutoCompleteTextView</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">19</TD>
+  <TD><A HREF="android.provider.Contacts.Intents.Insert.html">
+android.provider.Contacts.Intents.Insert</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">17</TD>
+  <TD><A HREF="android.view.GestureDetector.SimpleOnGestureListener.html">
+android.view.GestureDetector.SimpleOnGestureListener</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">16</TD>
+  <TD><A HREF="android.provider.MediaStore.Video.html">
+android.provider.MediaStore.Video</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">16</TD>
+  <TD><A HREF="android.text.SpanWatcher.html">
+<i>android.text.SpanWatcher</i></A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">16</TD>
+  <TD><A HREF="android.text.TextWatcher.html">
+<i>android.text.TextWatcher</i></A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">16</TD>
+  <TD><A HREF="android.text.style.ClickableSpan.html">
+android.text.style.ClickableSpan</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">16</TD>
+  <TD><A HREF="android.text.style.MaskFilterSpan.html">
+android.text.style.MaskFilterSpan</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">16</TD>
+  <TD><A HREF="android.text.style.RasterizerSpan.html">
+android.text.style.RasterizerSpan</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">16</TD>
+  <TD><A HREF="android.text.style.TextAppearanceSpan.html">
+android.text.style.TextAppearanceSpan</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">15</TD>
+  <TD><A HREF="android.webkit.UrlInterceptRegistry.html">
+android.webkit.UrlInterceptRegistry</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">14</TD>
+  <TD><A HREF="android.media.MediaRecorder.OutputFormat.html">
+android.media.MediaRecorder.OutputFormat</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">14</TD>
+  <TD><A HREF="android.net.NetworkInfo.html">
+android.net.NetworkInfo</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">14</TD>
+  <TD><A HREF="android.test.suitebuilder.TestMethod.html">
+android.test.suitebuilder.TestMethod</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">14</TD>
+  <TD><A HREF="android.text.method.QwertyKeyListener.html">
+android.text.method.QwertyKeyListener</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">14</TD>
+  <TD><A HREF="android.widget.AbsSeekBar.html">
+android.widget.AbsSeekBar</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">12</TD>
+  <TD><A HREF="android.view.WindowManager.LayoutParams.html">
+android.view.WindowManager.LayoutParams</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">12</TD>
+  <TD><A HREF="android.test.ActivityInstrumentationTestCase.html">
+android.test.ActivityInstrumentationTestCase</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">12</TD>
+  <TD><A HREF="android.test.InstrumentationTestCase.html">
+android.test.InstrumentationTestCase</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">12</TD>
+  <TD><A HREF="android.widget.AbsoluteLayout.html">
+android.widget.AbsoluteLayout</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">12</TD>
+  <TD><A HREF="java.util.logging.LogManager.html">
+java.util.logging.LogManager</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">11</TD>
+  <TD><A HREF="android.view.Gravity.html">
+android.view.Gravity</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">11</TD>
+  <TD><A HREF="android.widget.CursorAdapter.html">
+android.widget.CursorAdapter</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">11</TD>
+  <TD><A HREF="android.widget.TextView.html">
+android.widget.TextView</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">11</TD>
+  <TD><A HREF="android.text.method.DateKeyListener.html">
+android.text.method.DateKeyListener</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">11</TD>
+  <TD><A HREF="android.text.method.DateTimeKeyListener.html">
+android.text.method.DateTimeKeyListener</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">11</TD>
+  <TD><A HREF="android.text.method.DialerKeyListener.html">
+android.text.method.DialerKeyListener</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">11</TD>
+  <TD><A HREF="android.text.method.TimeKeyListener.html">
+android.text.method.TimeKeyListener</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">11</TD>
+  <TD><A HREF="android.webkit.WebHistoryItem.html">
+android.webkit.WebHistoryItem</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">11</TD>
+  <TD><A HREF="java.util.jar.Pack200.Unpacker.html">
+<i>java.util.jar.Pack200.Unpacker</i></A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">10</TD>
+  <TD><A HREF="android.media.MediaPlayer.html">
+android.media.MediaPlayer</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">10</TD>
+  <TD><A HREF="android.provider.MediaStore.Video.VideoColumns.html">
+<i>android.provider.MediaStore.Video.VideoColumns</i></A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">10</TD>
+  <TD><A HREF="android.test.ProviderTestCase.html">
+android.test.ProviderTestCase</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">10</TD>
+  <TD><A HREF="android.test.suitebuilder.TestSuiteBuilder.html">
+android.test.suitebuilder.TestSuiteBuilder</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">10</TD>
+  <TD><A HREF="android.widget.Chronometer.html">
+android.widget.Chronometer</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">10</TD>
+  <TD><A HREF="java.net.Socket.html">
+java.net.Socket</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">9</TD>
+  <TD><A HREF="android.graphics.drawable.TransitionDrawable.html">
+android.graphics.drawable.TransitionDrawable</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">9</TD>
+  <TD><A HREF="android.text.method.MultiTapKeyListener.html">
+android.text.method.MultiTapKeyListener</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">8</TD>
+  <TD><A HREF="android.media.AudioManager.html">
+android.media.AudioManager</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">8</TD>
+  <TD><A HREF="android.view.ViewTreeObserver.html">
+android.view.ViewTreeObserver</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">8</TD>
+  <TD><A HREF="java.lang.reflect.Proxy.html">
+java.lang.reflect.Proxy</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">8</TD>
+  <TD><A HREF="android.content.pm.PackageInfo.html">
+android.content.pm.PackageInfo</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">7</TD>
+  <TD><A HREF="android.text.Spanned.html">
+<i>android.text.Spanned</i></A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">7</TD>
+  <TD><A HREF="android.text.method.DigitsKeyListener.html">
+android.text.method.DigitsKeyListener</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">7</TD>
+  <TD><A HREF="android.hardware.Camera.html">
+android.hardware.Camera</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">7</TD>
+  <TD><A HREF="android.R.attr.html">
+android.R.attr</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">7</TD>
+  <TD><A HREF="android.telephony.TelephonyManager.html">
+android.telephony.TelephonyManager</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">7</TD>
+  <TD><A HREF="android.media.SoundPool.html">
+android.media.SoundPool</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">7</TD>
+  <TD><A HREF="android.os.Environment.html">
+android.os.Environment</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">6</TD>
+  <TD><A HREF="android.view.KeyEvent.html">
+android.view.KeyEvent</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">6</TD>
+  <TD><A HREF="java.lang.String.html">
+java.lang.String</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">6</TD>
+  <TD><A HREF="android.graphics.drawable.shapes.Shape.html">
+android.graphics.drawable.shapes.Shape</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">6</TD>
+  <TD><A HREF="android.text.method.MovementMethod.html">
+<i>android.text.method.MovementMethod</i></A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">6</TD>
+  <TD><A HREF="android.view.OrientationListener.html">
+android.view.OrientationListener</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">6</TD>
+  <TD><A HREF="dalvik.system.DexFile.html">
+dalvik.system.DexFile</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">6</TD>
+  <TD><A HREF="java.util.Date.html">
+java.util.Date</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">6</TD>
+  <TD><A HREF="android.text.TextUtils.html">
+android.text.TextUtils</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">6</TD>
+  <TD><A HREF="android.os.ParcelFileDescriptor.html">
+android.os.ParcelFileDescriptor</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">5</TD>
+  <TD><A HREF="android.webkit.WebView.html">
+android.webkit.WebView</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">5</TD>
+  <TD><A HREF="android.graphics.drawable.RotateDrawable.html">
+android.graphics.drawable.RotateDrawable</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">5</TD>
+  <TD><A HREF="android.graphics.drawable.ScaleDrawable.html">
+android.graphics.drawable.ScaleDrawable</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">5</TD>
+  <TD><A HREF="android.provider.MediaStore.Audio.AlbumColumns.html">
+<i>android.provider.MediaStore.Audio.AlbumColumns</i></A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">5</TD>
+  <TD><A HREF="android.provider.MediaStore.Audio.Media.html">
+android.provider.MediaStore.Audio.Media</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">5</TD>
+  <TD><A HREF="android.webkit.WebSettings.html">
+android.webkit.WebSettings</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">5</TD>
+  <TD><A HREF="android.content.res.Resources.html">
+android.content.res.Resources</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">5</TD>
+  <TD><A HREF="android.graphics.RectF.html">
+android.graphics.RectF</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">5</TD>
+  <TD><A HREF="android.os.Looper.html">
+android.os.Looper</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">5</TD>
+  <TD><A HREF="android.provider.Contacts.PeopleColumns.html">
+<i>android.provider.Contacts.PeopleColumns</i></A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">5</TD>
+  <TD><A HREF="android.text.method.ArrowKeyMovementMethod.html">
+android.text.method.ArrowKeyMovementMethod</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">5</TD>
+  <TD><A HREF="android.text.method.TextKeyListener.html">
+android.text.method.TextKeyListener</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">5</TD>
+  <TD><A HREF="android.view.ViewDebug.html">
+android.view.ViewDebug</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">5</TD>
+  <TD><A HREF="android.widget.Scroller.html">
+android.widget.Scroller</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">5</TD>
+  <TD><A HREF="android.widget.AbsListView.html">
+android.widget.AbsListView</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">5</TD>
+  <TD><A HREF="android.net.ConnectivityManager.html">
+android.net.ConnectivityManager</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">5</TD>
+  <TD><A HREF="android.view.KeyCharacterMap.html">
+android.view.KeyCharacterMap</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">4</TD>
+  <TD><A HREF="android.content.res.Configuration.html">
+android.content.res.Configuration</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">4</TD>
+  <TD><A HREF="android.widget.ProgressBar.html">
+android.widget.ProgressBar</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">4</TD>
+  <TD><A HREF="android.widget.SimpleCursorAdapter.html">
+android.widget.SimpleCursorAdapter</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">4</TD>
+  <TD><A HREF="android.R.string.html">
+android.R.string</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">4</TD>
+  <TD><A HREF="java.lang.Class.html">
+java.lang.Class</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">4</TD>
+  <TD><A HREF="java.util.jar.Pack200.Packer.html">
+<i>java.util.jar.Pack200.Packer</i></A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">4</TD>
+  <TD><A HREF="android.provider.MediaStore.Images.Media.html">
+android.provider.MediaStore.Images.Media</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">3</TD>
+  <TD><A HREF="android.os.Build.html">
+android.os.Build</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">3</TD>
+  <TD><A HREF="android.os.IBinder.html">
+<i>android.os.IBinder</i></A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">3</TD>
+  <TD><A HREF="android.text.method.ScrollingMovementMethod.html">
+android.text.method.ScrollingMovementMethod</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">3</TD>
+  <TD><A HREF="android.util.SparseIntArray.html">
+android.util.SparseIntArray</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">3</TD>
+  <TD><A HREF="android.content.Intent.html">
+android.content.Intent</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">3</TD>
+  <TD><A HREF="android.content.ContentResolver.html">
+android.content.ContentResolver</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">3</TD>
+  <TD><A HREF="android.net.wifi.WifiManager.html">
+android.net.wifi.WifiManager</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">3</TD>
+  <TD><A HREF="android.content.BroadcastReceiver.html">
+android.content.BroadcastReceiver</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">3</TD>
+  <TD><A HREF="android.os.Handler.html">
+android.os.Handler</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">3</TD>
+  <TD><A HREF="android.view.Menu.html">
+<i>android.view.Menu</i></A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">3</TD>
+  <TD><A HREF="android.view.animation.Animation.html">
+android.view.animation.Animation</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">3</TD>
+  <TD><A HREF="android.view.animation.Transformation.html">
+android.view.animation.Transformation</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">2</TD>
+  <TD><A HREF="android.webkit.URLUtil.html">
+android.webkit.URLUtil</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">2</TD>
+  <TD><A HREF="java.util.logging.Level.html">
+java.util.logging.Level</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">2</TD>
+  <TD><A HREF="android.R.style.html">
+android.R.style</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">2</TD>
+  <TD><A HREF="android.os.Binder.html">
+android.os.Binder</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">2</TD>
+  <TD><A HREF="android.view.ViewParent.html">
+<i>android.view.ViewParent</i></A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">2</TD>
+  <TD><A HREF="android.widget.GridView.html">
+android.widget.GridView</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">2</TD>
+  <TD><A HREF="android.test.mock.MockPackageManager.html">
+android.test.mock.MockPackageManager</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">2</TD>
+  <TD><A HREF="android.view.View.html">
+android.view.View</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">2</TD>
+  <TD><A HREF="android.widget.ListView.html">
+android.widget.ListView</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">2</TD>
+  <TD><A HREF="android.app.PendingIntent.html">
+android.app.PendingIntent</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">2</TD>
+  <TD><A HREF="android.content.pm.PackageManager.html">
+android.content.pm.PackageManager</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">2</TD>
+  <TD><A HREF="android.telephony.PhoneNumberUtils.html">
+android.telephony.PhoneNumberUtils</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">2</TD>
+  <TD><A HREF="android.content.ContentProvider.html">
+android.content.ContentProvider</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">2</TD>
+  <TD><A HREF="android.Manifest.permission.html">
+android.Manifest.permission</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">2</TD>
+  <TD><A HREF="android.widget.ArrayAdapter.html">
+android.widget.ArrayAdapter</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">2</TD>
+  <TD><A HREF="android.content.pm.ActivityInfo.html">
+android.content.pm.ActivityInfo</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">2</TD>
+  <TD><A HREF="dalvik.system.VMDebug.html">
+dalvik.system.VMDebug</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">1</TD>
+  <TD><A HREF="android.database.sqlite.SQLiteDatabase.html">
+android.database.sqlite.SQLiteDatabase</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">1</TD>
+  <TD><A HREF="android.content.res.TypedArray.html">
+android.content.res.TypedArray</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">1</TD>
+  <TD><A HREF="android.app.Activity.html">
+android.app.Activity</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">1</TD>
+  <TD><A HREF="android.preference.DialogPreference.html">
+android.preference.DialogPreference</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">1</TD>
+  <TD><A HREF="android.view.Window.html">
+android.view.Window</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">1</TD>
+  <TD><A HREF="android.graphics.Bitmap.html">
+android.graphics.Bitmap</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">1</TD>
+  <TD><A HREF="android.os.Debug.html">
+android.os.Debug</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">1</TD>
+  <TD><A HREF="android.provider.Browser.html">
+android.provider.Browser</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">1</TD>
+  <TD><A HREF="android.os.Parcel.html">
+android.os.Parcel</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">1</TD>
+  <TD><A HREF="android.database.DatabaseUtils.html">
+android.database.DatabaseUtils</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">1</TD>
+  <TD><A HREF="android.media.RingtoneManager.html">
+android.media.RingtoneManager</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">1</TD>
+  <TD><A HREF="android.graphics.Rect.html">
+android.graphics.Rect</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">1</TD>
+  <TD><A HREF="android.telephony.gsm.SmsMessage.html">
+android.telephony.gsm.SmsMessage</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">1</TD>
+  <TD><A HREF="android.database.Cursor.html">
+<i>android.database.Cursor</i></A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">1</TD>
+  <TD><A HREF="android.database.CursorWrapper.html">
+android.database.CursorWrapper</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">1</TD>
+  <TD><A HREF="android.view.MotionEvent.html">
+android.view.MotionEvent</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">1</TD>
+  <TD><A HREF="android.location.Location.html">
+android.location.Location</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">1</TD>
+  <TD><A HREF="android.graphics.drawable.Drawable.html">
+android.graphics.drawable.Drawable</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">&lt;1</TD>
+  <TD><A HREF="android.R.drawable.html">
+android.R.drawable</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">&lt;1</TD>
+  <TD><A HREF="android.app.Instrumentation.html">
+android.app.Instrumentation</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">&lt;1</TD>
+  <TD><A HREF="android.graphics.Canvas.html">
+android.graphics.Canvas</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">&lt;1</TD>
+  <TD><A HREF="android.content.Context.html">
+android.content.Context</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">&lt;1</TD>
+  <TD><A HREF="android.view.ViewGroup.html">
+android.view.ViewGroup</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">&lt;1</TD>
+  <TD><A HREF="java.lang.Character.UnicodeBlock.html">
+java.lang.Character.UnicodeBlock</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">&lt;1</TD>
+  <TD><A HREF="android.text.style.UpdateLayout.html">
+<i>android.text.style.UpdateLayout</i></A></TD>
+</TR>
+</TABLE>
+<br>
+<a name="numbers"></a>
+<h2>Total of Differences, by Number and Type</h2>
+<p>
+The table below lists the numbers of program elements (packages, classes, constructors, methods, and fields) that were removed, added or changed. The table includes only the highest-level program elements &mdash; that is, if a class with two methods was added, the number of methods added does not include those two methods, but the number of classes added does include that class.
+</p>
+<TABLE summary="Number of differences" WIDTH="100%">
+<TR>
+  <TH COLSPAN=5 NOWRAP>
+  Number of Differences</TH>
+</TR>
+<TR>
+  <TH>&nbsp;</TD>
+  <TH ALIGN="center"><b>Removals</b></TH>
+  <TH ALIGN="center"><b>Additions</b></TH>
+  <TH ALIGN="center"><b>Changes</b></TH>
+  <TH ALIGN="center"><b>Total</b></TH>
+</TR>
+<TR>
+  <TD>Packages</TD>
+  <TD ALIGN="right">0</TD>
+  <TD ALIGN="right">6</TD>
+  <TD ALIGN="right">39</TD>
+  <TD ALIGN="right">45</TD>
+</TR>
+<TR>
+  <TD>Classes and <i>Interfaces</i></TD>
+  <TD ALIGN="right">0</TD>
+  <TD ALIGN="right">67</TD>
+  <TD ALIGN="right">186</TD>
+  <TD ALIGN="right">253</TD>
+</TR>
+<TR>
+  <TD>Constructors</TD>
+  <TD ALIGN="right">1</TD>
+  <TD ALIGN="right">36</TD>
+  <TD ALIGN="right">15</TD>
+  <TD ALIGN="right">52</TD>
+</TR>
+<TR>
+  <TD>Methods</TD>
+  <TD ALIGN="right">0</TD>
+  <TD ALIGN="right">381</TD>
+  <TD ALIGN="right">71</TD>
+  <TD ALIGN="right">452</TD>
+</TR>
+<TR>
+  <TD>Fields</TD>
+  <TD ALIGN="right">1</TD>
+  <TD ALIGN="right">296</TD>
+  <TD ALIGN="right">68</TD>
+  <TD ALIGN="right">365</TD>
+</TR>
+<TR>
+  <TD><b>Total</b></TD>
+  <TD ALIGN="right">2</TD>
+  <TD ALIGN="right">786</TD>
+  <TD ALIGN="right">379</TD>
+  <TD ALIGN="right">1167</TD>
+</TR>
+</TABLE>
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY></HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/jdiff_topleftframe.html b/docs/html/sdk/api_diff/3/changes/jdiff_topleftframe.html
new file mode 100644
index 000000000000..666c9dd3ca8d
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/jdiff_topleftframe.html
@@ -0,0 +1,64 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+Android API Version Differences
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY class="gc-documentation">
+<table class="jdiffIndex" summary="Links to diff index files" BORDER="0" WIDTH="100%" cellspacing="0" cellpadding="0">
+<TR>
+  <th class="indexHeader" nowrap>
+  Select a Diffs Index:</th>
+</TR>
+<TR>
+  <TD><FONT CLASS="indexText" size="-2"><A HREF="alldiffs_index_all.html" TARGET="bottomleftframe">All Differences</A></FONT><br></TD>
+</TR>
+<TR>
+  <TD NOWRAP><FONT CLASS="indexText" size="-2"><A HREF="packages_index_all.html" TARGET="bottomleftframe">By Package</A></FONT><br></TD>
+</TR>
+<TR>
+  <TD NOWRAP><FONT CLASS="indexText" size="-2"><A HREF="classes_index_all.html" TARGET="bottomleftframe">By Class</A></FONT><br></TD>
+</TR>
+<TR>
+  <TD NOWRAP><FONT CLASS="indexText" size="-2"><A HREF="constructors_index_all.html" TARGET="bottomleftframe">By Constructor</A></FONT><br></TD>
+</TR>
+<TR>
+  <TD NOWRAP><FONT CLASS="indexText" size="-2"><A HREF="methods_index_all.html" TARGET="bottomleftframe">By Method</A></FONT><br></TD>
+</TR>
+<TR>
+  <TD NOWRAP><FONT CLASS="indexText" size="-2"><A HREF="fields_index_all.html" TARGET="bottomleftframe">By Field</A></FONT><br></TD>
+</TR>
+</TABLE>
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/methods_index_additions.html b/docs/html/sdk/api_diff/3/changes/methods_index_additions.html
new file mode 100644
index 000000000000..1fa2bdb6c706
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/methods_index_additions.html
@@ -0,0 +1,1397 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+Method Additions Index
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY class="gc-documentation">
+<a NAME="topheader"></a>
+<table summary="Index for Methods" width="100%" class="jdiffIndex" border="0" cellspacing="0" cellpadding="0" style="padding-bottom:0;margin-bottom:0;">
+  <tr>
+  <th class="indexHeader">
+    Filter the Index:
+  </th>
+  </tr>
+  <tr>
+  <td class="indexText" style="line-height:1.3em;padding-left:2em;">
+<a href="methods_index_all.html" class="staysblack">All Methods</a>
+  <br>
+<font color="#999999">Removals</font>
+  <br>
+<b>Additions</b>
+  <br>
+<A HREF="methods_index_changes.html"xclass="hiddenlink">Changes</A>
+  </td>
+  </tr>
+</table>
+<div id="indexTableCaption">
+<font size="-2"><strong>Bold</strong>&nbsp;indicates&nbsp;New;&nbsp;<strike>Strike</strike>&nbsp;indicates&nbsp;deleted. Plain indicates changed.</font>
+</div>
+<A NAME="A"></A>
+<br><font size="+2">A</font>&nbsp;
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.addGpsStatusListener_added(android.location.GpsStatus.Listener)" class="hiddenlink" target="rightframe"><b>addGpsStatusListener</b>
+(<code>Listener</code>)</A></nobr><br>
+<nobr><A HREF="android.view.ViewTreeObserver.html#android.view.ViewTreeObserver.addOnScrollChangedListener_added(android.view.ViewTreeObserver.OnScrollChangedListener)" class="hiddenlink" target="rightframe"><b>addOnScrollChangedListener</b>
+(<code>OnScrollChangedListener</code>)</A></nobr><br>
+<i>addPropertyChangeListener</i><br>
+&nbsp;&nbsp;<nobr><A HREF="java.util.jar.Pack200.Packer.html#java.util.jar.Pack200.Packer.addPropertyChangeListener_added(java.beans.PropertyChangeListener)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>PropertyChangeListener</code>)</b>&nbsp;in&nbsp;java.util.jar.Pack200.Packer
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="java.util.jar.Pack200.Unpacker.html#java.util.jar.Pack200.Unpacker.addPropertyChangeListener_added(java.beans.PropertyChangeListener)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>PropertyChangeListener</code>)</b>&nbsp;in&nbsp;java.util.jar.Pack200.Unpacker
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="java.util.logging.LogManager.html#java.util.logging.LogManager.addPropertyChangeListener_added(java.beans.PropertyChangeListener)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>PropertyChangeListener</code>)</b>&nbsp;in&nbsp;java.util.logging.LogManager
+</A></nobr><br>
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.addTestProvider_added(java.lang.String, boolean, boolean, boolean, boolean, boolean, boolean, boolean, int, int)" class="hiddenlink" target="rightframe"><b>addTestProvider</b>
+(<code>String, boolean, boolean, boolean, boolean, boolean, boolean, boolean, int, int</code>)</A></nobr><br>
+<nobr><A HREF="android.text.method.MetaKeyKeyListener.html#android.text.method.MetaKeyKeyListener.adjustMetaAfterKeypress_added(long)" class="hiddenlink" target="rightframe"><b>adjustMetaAfterKeypress</b>
+(<code>long</code>)</A></nobr><br>
+<nobr><A HREF="android.view.Gravity.html#android.view.Gravity.applyDisplay_added(int, android.graphics.Rect, android.graphics.Rect)" class="hiddenlink" target="rightframe"><b>applyDisplay</b>
+(<code>int, Rect, Rect</code>)</A></nobr><br>
+<A NAME="B"></A>
+<br><font size="+2">B</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.beginBatchEdit_added()" class="hiddenlink" target="rightframe"><b>beginBatchEdit</b>
+()</A></nobr><br>
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.bringPointIntoView_added(int)" class="hiddenlink" target="rightframe"><b>bringPointIntoView</b>
+(<code>int</code>)</A></nobr><br>
+<A NAME="C"></A>
+<br><font size="+2">C</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.telephony.gsm.SmsMessage.html#android.telephony.gsm.SmsMessage.calculateLength_added(java.lang.CharSequence, boolean)" class="hiddenlink" target="rightframe"><b>calculateLength</b>
+(<code>CharSequence, boolean</code>)</A></nobr><br>
+<nobr><A HREF="android.app.Instrumentation.html#android.app.Instrumentation.callActivityOnUserLeaving_added(android.app.Activity)" class="hiddenlink" target="rightframe"><b>callActivityOnUserLeaving</b>
+(<code>Activity</code>)</A></nobr><br>
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.changeAction_added(android.view.KeyEvent, int)" class="hiddenlink" target="rightframe"><b>changeAction</b>
+(<code>KeyEvent, int</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.SimpleCursorAdapter.html#android.widget.SimpleCursorAdapter.changeCursorAndColumns_added(android.database.Cursor, java.lang.String[], int[])" class="hiddenlink" target="rightframe"><b>changeCursorAndColumns</b>
+(<code>Cursor, String[], int[]</code>)</A></nobr><br>
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.changeFlags_added(android.view.KeyEvent, int)" class="hiddenlink" target="rightframe"><b>changeFlags</b>
+(<code>KeyEvent, int</code>)</A></nobr><br>
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.changeTimeRepeat_added(android.view.KeyEvent, long, int)" class="hiddenlink" target="rightframe"><b>changeTimeRepeat</b>
+(<code>KeyEvent, long, int</code>)</A></nobr><br>
+<nobr><A HREF="android.view.View.html#android.view.View.checkInputConnectionProxy_added(android.view.View)" class="hiddenlink" target="rightframe"><b>checkInputConnectionProxy</b>
+(<code>View</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.clearComposingText_added()" class="hiddenlink" target="rightframe"><b>clearComposingText</b>
+()</A></nobr><br>
+<nobr><A HREF="android.widget.AutoCompleteTextView.html#android.widget.AutoCompleteTextView.clearListSelection_added()" class="hiddenlink" target="rightframe"><b>clearListSelection</b>
+()</A></nobr><br>
+<nobr><A HREF="android.webkit.WebView.html#android.webkit.WebView.clearMatches_added()" class="hiddenlink" target="rightframe"><b>clearMatches</b>
+()</A></nobr><br>
+<i>clearMetaKeyState</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.KeyListener.html#android.text.method.KeyListener.clearMetaKeyState_added(android.view.View, android.text.Editable, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>View, Editable, int</code>)</b>&nbsp;in&nbsp;android.text.method.KeyListener
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.MetaKeyKeyListener.html#android.text.method.MetaKeyKeyListener.clearMetaKeyState_added(long, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>long, int</code>)</b>&nbsp;in&nbsp;android.text.method.MetaKeyKeyListener
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.MetaKeyKeyListener.html#android.text.method.MetaKeyKeyListener.clearMetaKeyState_added(android.view.View, android.text.Editable, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>View, Editable, int</code>)</b>&nbsp;in&nbsp;android.text.method.MetaKeyKeyListener
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.MetaKeyKeyListener.html#android.text.method.MetaKeyKeyListener.clearMetaKeyState_added(android.text.Editable, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Editable, int</code>)</b>&nbsp;in&nbsp;android.text.method.MetaKeyKeyListener
+</A></nobr><br>
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.clearTestProviderEnabled_added(java.lang.String)" class="hiddenlink" target="rightframe"><b>clearTestProviderEnabled</b>
+(<code>String</code>)</A></nobr><br>
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.clearTestProviderLocation_added(java.lang.String)" class="hiddenlink" target="rightframe"><b>clearTestProviderLocation</b>
+(<code>String</code>)</A></nobr><br>
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.clearTestProviderStatus_added(java.lang.String)" class="hiddenlink" target="rightframe"><b>clearTestProviderStatus</b>
+(<code>String</code>)</A></nobr><br>
+<nobr><A HREF="android.view.Menu.html#android.view.Menu.close_added()" class="hiddenlink" target="rightframe"><b>close</b>
+()</A></nobr><br>
+<nobr><A HREF="android.app.Activity.html#android.app.Activity.closeContextMenu_added()" class="hiddenlink" target="rightframe"><b>closeContextMenu</b>
+()</A></nobr><br>
+<nobr><A HREF="android.view.animation.Animation.html#android.view.animation.Animation.computeDurationHint_added()" class="hiddenlink" target="rightframe"><b>computeDurationHint</b>
+()</A></nobr><br>
+<nobr><A HREF="android.graphics.Bitmap.html#android.graphics.Bitmap.copyPixelsFromBuffer_added(java.nio.Buffer)" class="hiddenlink" target="rightframe"><b>copyPixelsFromBuffer</b>
+(<code>Buffer</code>)</A></nobr><br>
+<nobr><A HREF="android.content.res.AssetFileDescriptor.html#android.content.res.AssetFileDescriptor.createInputStream_added()" class="hiddenlink" target="rightframe"><b>createInputStream</b>
+()</A></nobr><br>
+<nobr><A HREF="android.content.res.AssetFileDescriptor.html#android.content.res.AssetFileDescriptor.createOutputStream_added()" class="hiddenlink" target="rightframe"><b>createOutputStream</b>
+()</A></nobr><br>
+<nobr><A HREF="android.net.wifi.WifiManager.html#android.net.wifi.WifiManager.createWifiLock_added(int, java.lang.String)" class="hiddenlink" target="rightframe"><b>createWifiLock</b>
+(<code>int, String</code>)</A></nobr><br>
+<A NAME="D"></A>
+<br><font size="+2">D</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<i>describeContents</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.content.res.AssetFileDescriptor.html#android.content.res.AssetFileDescriptor.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.content.res.AssetFileDescriptor
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.graphics.RectF.html#android.graphics.RectF.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.graphics.RectF
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.Annotation.html#android.text.Annotation.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.Annotation
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.AbsoluteSizeSpan.html#android.text.style.AbsoluteSizeSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.AbsoluteSizeSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.AlignmentSpan.Standard.html#android.text.style.AlignmentSpan.Standard.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.AlignmentSpan.Standard
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.BackgroundColorSpan.html#android.text.style.BackgroundColorSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.BackgroundColorSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.BulletSpan.html#android.text.style.BulletSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.BulletSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.ForegroundColorSpan.html#android.text.style.ForegroundColorSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.ForegroundColorSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.LeadingMarginSpan.Standard.html#android.text.style.LeadingMarginSpan.Standard.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.LeadingMarginSpan.Standard
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.QuoteSpan.html#android.text.style.QuoteSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.QuoteSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.RelativeSizeSpan.html#android.text.style.RelativeSizeSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.RelativeSizeSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.ScaleXSpan.html#android.text.style.ScaleXSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.ScaleXSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.StrikethroughSpan.html#android.text.style.StrikethroughSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.StrikethroughSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.StyleSpan.html#android.text.style.StyleSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.StyleSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.SubscriptSpan.html#android.text.style.SubscriptSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.SubscriptSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.SuperscriptSpan.html#android.text.style.SuperscriptSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.SuperscriptSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.TextAppearanceSpan.html#android.text.style.TextAppearanceSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.TextAppearanceSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.TypefaceSpan.html#android.text.style.TypefaceSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.TypefaceSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.URLSpan.html#android.text.style.URLSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.URLSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.UnderlineSpan.html#android.text.style.UnderlineSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.UnderlineSpan
+</A></nobr><br>
+<nobr><A HREF="android.view.KeyCharacterMap.html#android.view.KeyCharacterMap.deviceHasKey_added(int)" class="hiddenlink" target="rightframe"><b>deviceHasKey</b>
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.view.KeyCharacterMap.html#android.view.KeyCharacterMap.deviceHasKeys_added(int[])" class="hiddenlink" target="rightframe"><b>deviceHasKeys</b>
+(<code>int[]</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.didTouchFocusSelect_added()" class="hiddenlink" target="rightframe"><b>didTouchFocusSelect</b>
+()</A></nobr><br>
+<nobr><A HREF="android.view.View.html#android.view.View.dispatchKeyEventPreIme_added(android.view.KeyEvent)" class="hiddenlink" target="rightframe"><b>dispatchKeyEventPreIme</b>
+(<code>KeyEvent</code>)</A></nobr><br>
+<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.drag_added(android.test.InstrumentationTestCase, float, float, float, float, int)" class="hiddenlink" target="rightframe"><b>drag</b>
+(<code>InstrumentationTestCase, float, float, float, float, int</code>)</A></nobr><br>
+<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragQuarterScreenDown_added(android.test.InstrumentationTestCase, android.app.Activity)" class="hiddenlink" target="rightframe"><b>dragQuarterScreenDown</b>
+(<code>InstrumentationTestCase, Activity</code>)</A></nobr><br>
+<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragQuarterScreenUp_added(android.test.InstrumentationTestCase, android.app.Activity)" class="hiddenlink" target="rightframe"><b>dragQuarterScreenUp</b>
+(<code>InstrumentationTestCase, Activity</code>)</A></nobr><br>
+<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewBy_added(android.test.InstrumentationTestCase, android.view.View, int, int, int)" class="hiddenlink" target="rightframe"><b>dragViewBy</b>
+(<code>InstrumentationTestCase, View, int, int, int</code>)</A></nobr><br>
+<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewTo_added(android.test.InstrumentationTestCase, android.view.View, int, int, int)" class="hiddenlink" target="rightframe"><b>dragViewTo</b>
+(<code>InstrumentationTestCase, View, int, int, int</code>)</A></nobr><br>
+<i>dragViewToBottom</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewToBottom_added(android.test.ActivityInstrumentationTestCase, android.view.View, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>ActivityInstrumentationTestCase, View, int</code>)</b>&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewToBottom_added(android.test.InstrumentationTestCase, android.app.Activity, android.view.View, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>InstrumentationTestCase, Activity, View, int</code>)</b>&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+<i>dragViewToTop</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewToTop_added(android.test.InstrumentationTestCase, android.view.View)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>InstrumentationTestCase, View</code>)</b>&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewToTop_added(android.test.InstrumentationTestCase, android.view.View, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>InstrumentationTestCase, View, int</code>)</b>&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewToX_added(android.test.InstrumentationTestCase, android.view.View, int, int)" class="hiddenlink" target="rightframe"><b>dragViewToX</b>
+(<code>InstrumentationTestCase, View, int, int</code>)</A></nobr><br>
+<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewToY_added(android.test.InstrumentationTestCase, android.view.View, int, int)" class="hiddenlink" target="rightframe"><b>dragViewToY</b>
+(<code>InstrumentationTestCase, View, int, int</code>)</A></nobr><br>
+<nobr><A HREF="android.graphics.Canvas.html#android.graphics.Canvas.drawBitmap_added(int[], int, int, float, float, int, int, boolean, android.graphics.Paint)" class="hiddenlink" target="rightframe"><b>drawBitmap</b>
+(<code>int[], int, int, float, float, int, int, boolean, Paint</code>)</A></nobr><br>
+<i>dump</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.location.Location.html#android.location.Location.dump_added(android.util.Printer, java.lang.String)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Printer, String</code>)</b>&nbsp;in&nbsp;android.location.Location
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.os.Binder.html#android.os.Binder.dump_added(java.io.FileDescriptor, java.lang.String[])" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>FileDescriptor, String[]</code>)</b>&nbsp;in&nbsp;android.os.Binder
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.os.IBinder.html#android.os.IBinder.dump_added(java.io.FileDescriptor, java.lang.String[])" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>FileDescriptor, String[]</code>)</b>&nbsp;in&nbsp;android.os.IBinder
+</A></nobr><br>
+<nobr><A HREF="android.view.ViewDebug.html#android.view.ViewDebug.dumpCapturedView_added(java.lang.String, java.lang.Object)" class="hiddenlink" target="rightframe"><b>dumpCapturedView</b>
+(<code>String, Object</code>)</A></nobr><br>
+<i>dumpHprofData</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.os.Debug.html#android.os.Debug.dumpHprofData_added(java.lang.String)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>String</code>)</b>&nbsp;in&nbsp;android.os.Debug
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="dalvik.system.VMDebug.html#dalvik.system.VMDebug.dumpHprofData_added(java.lang.String)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>String</code>)</b>&nbsp;in&nbsp;dalvik.system.VMDebug
+</A></nobr><br>
+<nobr><A HREF="android.text.TextUtils.html#android.text.TextUtils.dumpSpans_added(java.lang.CharSequence, android.util.Printer, java.lang.String)" class="hiddenlink" target="rightframe"><b>dumpSpans</b>
+(<code>CharSequence, Printer, String</code>)</A></nobr><br>
+<A NAME="E"></A>
+<br><font size="+2">E</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.endBatchEdit_added()" class="hiddenlink" target="rightframe"><b>endBatchEdit</b>
+()</A></nobr><br>
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.extractText_added(android.view.inputmethod.ExtractedTextRequest, android.view.inputmethod.ExtractedText)" class="hiddenlink" target="rightframe"><b>extractText</b>
+(<code>ExtractedTextRequest, ExtractedText</code>)</A></nobr><br>
+<A NAME="F"></A>
+<br><font size="+2">F</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.webkit.WebView.html#android.webkit.WebView.findAll_added(java.lang.String)" class="hiddenlink" target="rightframe"><b>findAll</b>
+(<code>String</code>)</A></nobr><br>
+<nobr><A HREF="android.webkit.WebView.html#android.webkit.WebView.findNext_added(boolean)" class="hiddenlink" target="rightframe"><b>findNext</b>
+(<code>boolean</code>)</A></nobr><br>
+<nobr><A HREF="dalvik.system.Zygote.html#dalvik.system.Zygote.forkAndSpecialize_added(int, int, int[], int, int[][])" class="hiddenlink" target="rightframe"><b>forkAndSpecialize</b>
+(<code>int, int, int[], int, int[][]</code>)</A></nobr><br>
+<nobr><A HREF="dalvik.system.Zygote.html#dalvik.system.Zygote.forkSystemServer_added(int, int, int[], int, int[][])" class="hiddenlink" target="rightframe"><b>forkSystemServer</b>
+(<code>int, int, int[], int, int[][]</code>)</A></nobr><br>
+<nobr><A HREF="android.telephony.PhoneNumberUtils.html#android.telephony.PhoneNumberUtils.formatJapaneseNumber_added(android.text.Editable)" class="hiddenlink" target="rightframe"><b>formatJapaneseNumber</b>
+(<code>Editable</code>)</A></nobr><br>
+<A NAME="G"></A>
+<br><font size="+2">G</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.get_added(android.content.Context)" class="hiddenlink" target="rightframe"><b>get</b>
+(<code>Context</code>)</A></nobr><br>
+<nobr><A HREF="android.webkit.WebSettings.html#android.webkit.WebSettings.getAllowFileAccess_added()" class="hiddenlink" target="rightframe"><b>getAllowFileAccess</b>
+()</A></nobr><br>
+<nobr><A HREF="android.net.ConnectivityManager.html#android.net.ConnectivityManager.getBackgroundDataSetting_added()" class="hiddenlink" target="rightframe"><b>getBackgroundDataSetting</b>
+()</A></nobr><br>
+<nobr><A HREF="android.content.res.Resources.html#android.content.res.Resources.getBoolean_added(int)" class="hiddenlink" target="rightframe"><b>getBoolean</b>
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.webkit.WebSettings.html#android.webkit.WebSettings.getBuiltInZoomControls_added()" class="hiddenlink" target="rightframe"><b>getBuiltInZoomControls</b>
+()</A></nobr><br>
+<nobr><A HREF="android.app.AlertDialog.html#android.app.AlertDialog.getButton_added(int)" class="hiddenlink" target="rightframe"><b>getButton</b>
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.text.TextUtils.html#android.text.TextUtils.getCapsMode_added(java.lang.CharSequence, int, int)" class="hiddenlink" target="rightframe"><b>getCapsMode</b>
+(<code>CharSequence, int, int</code>)</A></nobr><br>
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.getCharacters_added()" class="hiddenlink" target="rightframe"><b>getCharacters</b>
+()</A></nobr><br>
+<nobr><A HREF="android.content.res.AssetFileDescriptor.html#android.content.res.AssetFileDescriptor.getDeclaredLength_added()" class="hiddenlink" target="rightframe"><b>getDeclaredLength</b>
+()</A></nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.getDefaultSensor_added(int)" class="hiddenlink" target="rightframe"><b>getDefaultSensor</b>
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.app.ActivityManager.html#android.app.ActivityManager.getDeviceConfigurationInfo_added()" class="hiddenlink" target="rightframe"><b>getDeviceConfigurationInfo</b>
+()</A></nobr><br>
+<nobr><A HREF="android.preference.DialogPreference.html#android.preference.DialogPreference.getDialog_added()" class="hiddenlink" target="rightframe"><b>getDialog</b>
+()</A></nobr><br>
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getDoubleTapTimeout_added()" class="hiddenlink" target="rightframe"><b>getDoubleTapTimeout</b>
+()</A></nobr><br>
+<i>getDrawable</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.graphics.drawable.RotateDrawable.html#android.graphics.drawable.RotateDrawable.getDrawable_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.graphics.drawable.RotateDrawable
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.graphics.drawable.ScaleDrawable.html#android.graphics.drawable.ScaleDrawable.getDrawable_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.graphics.drawable.ScaleDrawable
+</A></nobr><br>
+<nobr><A HREF="android.widget.AutoCompleteTextView.html#android.widget.AutoCompleteTextView.getDropDownAnchor_added()" class="hiddenlink" target="rightframe"><b>getDropDownAnchor</b>
+()</A></nobr><br>
+<nobr><A HREF="android.widget.AutoCompleteTextView.html#android.widget.AutoCompleteTextView.getDropDownWidth_added()" class="hiddenlink" target="rightframe"><b>getDropDownWidth</b>
+()</A></nobr><br>
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.getEditableText_added()" class="hiddenlink" target="rightframe"><b>getEditableText</b>
+()</A></nobr><br>
+<nobr><A HREF="android.content.res.Resources.html#android.content.res.Resources.getFraction_added(int, int, int)" class="hiddenlink" target="rightframe"><b>getFraction</b>
+(<code>int, int, int</code>)</A></nobr><br>
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.getGpsStatus_added(android.location.GpsStatus)" class="hiddenlink" target="rightframe"><b>getGpsStatus</b>
+(<code>GpsStatus</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.getImeActionId_added()" class="hiddenlink" target="rightframe"><b>getImeActionId</b>
+()</A></nobr><br>
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.getImeActionLabel_added()" class="hiddenlink" target="rightframe"><b>getImeActionLabel</b>
+()</A></nobr><br>
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.getImeOptions_added()" class="hiddenlink" target="rightframe"><b>getImeOptions</b>
+()</A></nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.getInclination_added(float[])" class="hiddenlink" target="rightframe"><b>getInclination</b>
+(<code>float[]</code>)</A></nobr><br>
+<nobr><A HREF="android.text.method.Touch.html#android.text.method.Touch.getInitialScrollX_added(android.widget.TextView, android.text.Spannable)" class="hiddenlink" target="rightframe"><b>getInitialScrollX</b>
+(<code>TextView, Spannable</code>)</A></nobr><br>
+<nobr><A HREF="android.text.method.Touch.html#android.text.method.Touch.getInitialScrollY_added(android.widget.TextView, android.text.Spannable)" class="hiddenlink" target="rightframe"><b>getInitialScrollY</b>
+(<code>TextView, Spannable</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.getInputExtras_added(boolean)" class="hiddenlink" target="rightframe"><b>getInputExtras</b>
+(<code>boolean</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.getInputMethodMode_added()" class="hiddenlink" target="rightframe"><b>getInputMethodMode</b>
+()</A></nobr><br>
+<i>getInputType</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.DateKeyListener.html#android.text.method.DateKeyListener.getInputType_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.method.DateKeyListener
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.DateTimeKeyListener.html#android.text.method.DateTimeKeyListener.getInputType_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.method.DateTimeKeyListener
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.DialerKeyListener.html#android.text.method.DialerKeyListener.getInputType_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.method.DialerKeyListener
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.DigitsKeyListener.html#android.text.method.DigitsKeyListener.getInputType_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.method.DigitsKeyListener
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.KeyListener.html#android.text.method.KeyListener.getInputType_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.method.KeyListener
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.MultiTapKeyListener.html#android.text.method.MultiTapKeyListener.getInputType_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.method.MultiTapKeyListener
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.QwertyKeyListener.html#android.text.method.QwertyKeyListener.getInputType_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.method.QwertyKeyListener
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.TextKeyListener.html#android.text.method.TextKeyListener.getInputType_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.method.TextKeyListener
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.TimeKeyListener.html#android.text.method.TimeKeyListener.getInputType_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.method.TimeKeyListener
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.getInputType_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.widget.TextView
+</A></nobr><br>
+<nobr><A HREF="android.view.Menu.html#android.view.Menu.getItem_added(int)" class="hiddenlink" target="rightframe"><b>getItem</b>
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.AbsSeekBar.html#android.widget.AbsSeekBar.getKeyProgressIncrement_added()" class="hiddenlink" target="rightframe"><b>getKeyProgressIncrement</b>
+()</A></nobr><br>
+<i>getLaunchIntentForPackage</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.content.pm.PackageManager.html#android.content.pm.PackageManager.getLaunchIntentForPackage_added(java.lang.String)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>String</code>)</b>&nbsp;in&nbsp;android.content.pm.PackageManager
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.mock.MockPackageManager.html#android.test.mock.MockPackageManager.getLaunchIntentForPackage_added(java.lang.String)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>String</code>)</b>&nbsp;in&nbsp;android.test.mock.MockPackageManager
+</A></nobr><br>
+<nobr><A HREF="android.content.res.TypedArray.html#android.content.res.TypedArray.getLayoutDimension_added(int, int)" class="hiddenlink" target="rightframe"><b>getLayoutDimension</b>
+(<code>int, int</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.AutoCompleteTextView.html#android.widget.AutoCompleteTextView.getListSelection_added()" class="hiddenlink" target="rightframe"><b>getListSelection</b>
+()</A></nobr><br>
+<nobr><A HREF="android.app.AlertDialog.html#android.app.AlertDialog.getListView_added()" class="hiddenlink" target="rightframe"><b>getListView</b>
+()</A></nobr><br>
+<nobr><A HREF="java.util.logging.LogManager.html#java.util.logging.LogManager.getLoggingMXBean_added()" class="hiddenlink" target="rightframe"><b>getLoggingMXBean</b>
+()</A></nobr><br>
+<i>getLong</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.getLong_added(android.content.ContentResolver, java.lang.String)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>ContentResolver, String</code>)</b>&nbsp;in&nbsp;android.provider.Settings.System
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.getLong_added(android.content.ContentResolver, java.lang.String, long)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>ContentResolver, String, long</code>)</b>&nbsp;in&nbsp;android.provider.Settings.System
+</A></nobr><br>
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.getMaxAvailableHeight_added(android.view.View, int)" class="hiddenlink" target="rightframe"><b>getMaxAvailableHeight</b>
+(<code>View, int</code>)</A></nobr><br>
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.getMaxKeyCode_added()" class="hiddenlink" target="rightframe"><b>getMaxKeyCode</b>
+()</A></nobr><br>
+<i>getMetaState</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.MetaKeyKeyListener.html#android.text.method.MetaKeyKeyListener.getMetaState_added(long)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>long</code>)</b>&nbsp;in&nbsp;android.text.method.MetaKeyKeyListener
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.MetaKeyKeyListener.html#android.text.method.MetaKeyKeyListener.getMetaState_added(long, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>long, int</code>)</b>&nbsp;in&nbsp;android.text.method.MetaKeyKeyListener
+</A></nobr><br>
+<nobr><A HREF="android.telephony.TelephonyManager.html#android.telephony.TelephonyManager.getNeighboringCellInfo_added()" class="hiddenlink" target="rightframe"><b>getNeighboringCellInfo</b>
+()</A></nobr><br>
+<nobr><A HREF="android.widget.Chronometer.html#android.widget.Chronometer.getOnChronometerTickListener_added()" class="hiddenlink" target="rightframe"><b>getOnChronometerTickListener</b>
+()</A></nobr><br>
+<nobr><A HREF="android.widget.AutoCompleteTextView.html#android.widget.AutoCompleteTextView.getOnItemClickListener_added()" class="hiddenlink" target="rightframe"><b>getOnItemClickListener</b>
+()</A></nobr><br>
+<nobr><A HREF="android.widget.AutoCompleteTextView.html#android.widget.AutoCompleteTextView.getOnItemSelectedListener_added()" class="hiddenlink" target="rightframe"><b>getOnItemSelectedListener</b>
+()</A></nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.getOrientation_added(float[], float[])" class="hiddenlink" target="rightframe"><b>getOrientation</b>
+(<code>float[], float[]</code>)</A></nobr><br>
+<i>getOriginalUrl</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.webkit.WebHistoryItem.html#android.webkit.WebHistoryItem.getOriginalUrl_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.webkit.WebHistoryItem
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.webkit.WebView.html#android.webkit.WebView.getOriginalUrl_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.webkit.WebView
+</A></nobr><br>
+<i>getPluginData</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.webkit.UrlInterceptHandler.html#android.webkit.UrlInterceptHandler.getPluginData_added(java.lang.String, java.util.Map<java.lang.String, java.lang.String>)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>String, Map&lt;String, String&gt;</code>)</b>&nbsp;in&nbsp;android.webkit.UrlInterceptHandler
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.webkit.UrlInterceptRegistry.html#android.webkit.UrlInterceptRegistry.getPluginData_added(java.lang.String, java.util.Map<java.lang.String, java.lang.String>)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>String, Map&lt;String, String&gt;</code>)</b>&nbsp;in&nbsp;android.webkit.UrlInterceptRegistry
+</A></nobr><br>
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.getPrivateImeOptions_added()" class="hiddenlink" target="rightframe"><b>getPrivateImeOptions</b>
+()</A></nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.getRotationMatrix_added(float[], float[], float[], float[])" class="hiddenlink" target="rightframe"><b>getRotationMatrix</b>
+(<code>float[], float[], float[], float[]</code>)</A></nobr><br>
+<nobr><A HREF="android.app.ActivityManager.html#android.app.ActivityManager.getRunningAppProcesses_added()" class="hiddenlink" target="rightframe"><b>getRunningAppProcesses</b>
+()</A></nobr><br>
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getScaledDoubleTapSlop_added()" class="hiddenlink" target="rightframe"><b>getScaledDoubleTapSlop</b>
+()</A></nobr><br>
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getScaledEdgeSlop_added()" class="hiddenlink" target="rightframe"><b>getScaledEdgeSlop</b>
+()</A></nobr><br>
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getScaledFadingEdgeLength_added()" class="hiddenlink" target="rightframe"><b>getScaledFadingEdgeLength</b>
+()</A></nobr><br>
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getScaledMaximumDrawingCacheSize_added()" class="hiddenlink" target="rightframe"><b>getScaledMaximumDrawingCacheSize</b>
+()</A></nobr><br>
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getScaledMinimumFlingVelocity_added()" class="hiddenlink" target="rightframe"><b>getScaledMinimumFlingVelocity</b>
+()</A></nobr><br>
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getScaledScrollBarSize_added()" class="hiddenlink" target="rightframe"><b>getScaledScrollBarSize</b>
+()</A></nobr><br>
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getScaledTouchSlop_added()" class="hiddenlink" target="rightframe"><b>getScaledTouchSlop</b>
+()</A></nobr><br>
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getScaledWindowTouchSlop_added()" class="hiddenlink" target="rightframe"><b>getScaledWindowTouchSlop</b>
+()</A></nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.getSensorList_added(int)" class="hiddenlink" target="rightframe"><b>getSensorList</b>
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.text.AutoText.html#android.text.AutoText.getSize_added(android.view.View)" class="hiddenlink" target="rightframe"><b>getSize</b>
+(<code>View</code>)</A></nobr><br>
+<i>getSpanTypeId</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.Annotation.html#android.text.Annotation.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.Annotation
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.AbsoluteSizeSpan.html#android.text.style.AbsoluteSizeSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.AbsoluteSizeSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.AlignmentSpan.Standard.html#android.text.style.AlignmentSpan.Standard.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.AlignmentSpan.Standard
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.BackgroundColorSpan.html#android.text.style.BackgroundColorSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.BackgroundColorSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.BulletSpan.html#android.text.style.BulletSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.BulletSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.ForegroundColorSpan.html#android.text.style.ForegroundColorSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.ForegroundColorSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.LeadingMarginSpan.Standard.html#android.text.style.LeadingMarginSpan.Standard.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.LeadingMarginSpan.Standard
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.QuoteSpan.html#android.text.style.QuoteSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.QuoteSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.RelativeSizeSpan.html#android.text.style.RelativeSizeSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.RelativeSizeSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.ScaleXSpan.html#android.text.style.ScaleXSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.ScaleXSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.StrikethroughSpan.html#android.text.style.StrikethroughSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.StrikethroughSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.StyleSpan.html#android.text.style.StyleSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.StyleSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.SubscriptSpan.html#android.text.style.SubscriptSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.SubscriptSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.SuperscriptSpan.html#android.text.style.SuperscriptSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.SuperscriptSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.TextAppearanceSpan.html#android.text.style.TextAppearanceSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.TextAppearanceSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.TypefaceSpan.html#android.text.style.TypefaceSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.TypefaceSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.URLSpan.html#android.text.style.URLSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.URLSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.UnderlineSpan.html#android.text.style.UnderlineSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.UnderlineSpan
+</A></nobr><br>
+<nobr><A HREF="android.widget.Scroller.html#android.widget.Scroller.getStartX_added()" class="hiddenlink" target="rightframe"><b>getStartX</b>
+()</A></nobr><br>
+<nobr><A HREF="android.widget.Scroller.html#android.widget.Scroller.getStartY_added()" class="hiddenlink" target="rightframe"><b>getStartY</b>
+()</A></nobr><br>
+<nobr><A HREF="android.os.ParcelFileDescriptor.html#android.os.ParcelFileDescriptor.getStatSize_added()" class="hiddenlink" target="rightframe"><b>getStatSize</b>
+()</A></nobr><br>
+<nobr><A HREF="android.net.NetworkInfo.html#android.net.NetworkInfo.getSubtype_added()" class="hiddenlink" target="rightframe"><b>getSubtype</b>
+()</A></nobr><br>
+<nobr><A HREF="android.net.NetworkInfo.html#android.net.NetworkInfo.getSubtypeName_added()" class="hiddenlink" target="rightframe"><b>getSubtypeName</b>
+()</A></nobr><br>
+<i>getSystemSharedLibraryNames</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.content.pm.PackageManager.html#android.content.pm.PackageManager.getSystemSharedLibraryNames_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.content.pm.PackageManager
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.mock.MockPackageManager.html#android.test.mock.MockPackageManager.getSystemSharedLibraryNames_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.test.mock.MockPackageManager
+</A></nobr><br>
+<nobr><A HREF="android.widget.AbsListView.html#android.widget.AbsListView.getTextFilter_added()" class="hiddenlink" target="rightframe"><b>getTextFilter</b>
+()</A></nobr><br>
+<nobr><A HREF="android.os.Looper.html#android.os.Looper.getThread_added()" class="hiddenlink" target="rightframe"><b>getThread</b>
+()</A></nobr><br>
+<nobr><A HREF="android.util.TimeUtils.html#android.util.TimeUtils.getTimeZoneDatabaseVersion_added()" class="hiddenlink" target="rightframe"><b>getTimeZoneDatabaseVersion</b>
+()</A></nobr><br>
+<nobr><A HREF="android.webkit.WebSettings.html#android.webkit.WebSettings.getUserAgentString_added()" class="hiddenlink" target="rightframe"><b>getUserAgentString</b>
+()</A></nobr><br>
+<nobr><A HREF="android.text.style.DynamicDrawableSpan.html#android.text.style.DynamicDrawableSpan.getVerticalAlignment_added()" class="hiddenlink" target="rightframe"><b>getVerticalAlignment</b>
+()</A></nobr><br>
+<nobr><A HREF="android.view.View.html#android.view.View.getWindowVisibleDisplayFrame_added(android.graphics.Rect)" class="hiddenlink" target="rightframe"><b>getWindowVisibleDisplayFrame</b>
+(<code>Rect</code>)</A></nobr><br>
+<A NAME="H"></A>
+<br><font size="+2">H</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.text.method.MetaKeyKeyListener.html#android.text.method.MetaKeyKeyListener.handleKeyDown_added(long, int, android.view.KeyEvent)" class="hiddenlink" target="rightframe"><b>handleKeyDown</b>
+(<code>long, int, KeyEvent</code>)</A></nobr><br>
+<nobr><A HREF="android.text.method.MetaKeyKeyListener.html#android.text.method.MetaKeyKeyListener.handleKeyUp_added(long, int, android.view.KeyEvent)" class="hiddenlink" target="rightframe"><b>handleKeyUp</b>
+(<code>long, int, KeyEvent</code>)</A></nobr><br>
+<nobr><A HREF="android.view.Window.html#android.view.Window.hasSoftInputMode_added()" class="hiddenlink" target="rightframe"><b>hasSoftInputMode</b>
+()</A></nobr><br>
+<nobr><A HREF="android.app.Activity.html#android.app.Activity.hasWindowFocus_added()" class="hiddenlink" target="rightframe"><b>hasWindowFocus</b>
+()</A></nobr><br>
+<A NAME="I"></A>
+<br><font size="+2">I</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.media.RingtoneManager.html#android.media.RingtoneManager.inferStreamType_added()" class="hiddenlink" target="rightframe"><b>inferStreamType</b>
+()</A></nobr><br>
+<nobr><A HREF="android.app.LauncherActivity.html#android.app.LauncherActivity.intentForPosition_added(int)" class="hiddenlink" target="rightframe"><b>intentForPosition</b>
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.isAboveAnchor_added()" class="hiddenlink" target="rightframe"><b>isAboveAnchor</b>
+()</A></nobr><br>
+<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.isBluetoothA2dpOn_added()" class="hiddenlink" target="rightframe"><b>isBluetoothA2dpOn</b>
+()</A></nobr><br>
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.isClippingEnabled_added()" class="hiddenlink" target="rightframe"><b>isClippingEnabled</b>
+()</A></nobr><br>
+<nobr><A HREF="dalvik.system.VMDebug.html#dalvik.system.VMDebug.isDebuggingEnabled_added()" class="hiddenlink" target="rightframe"><b>isDebuggingEnabled</b>
+()</A></nobr><br>
+<nobr><A HREF="android.widget.AbsListView.html#android.widget.AbsListView.isFastScrollEnabled_added()" class="hiddenlink" target="rightframe"><b>isFastScrollEnabled</b>
+()</A></nobr><br>
+<nobr><A HREF="android.view.animation.Animation.html#android.view.animation.Animation.isFillEnabled_added()" class="hiddenlink" target="rightframe"><b>isFillEnabled</b>
+()</A></nobr><br>
+<nobr><A HREF="android.view.View.html#android.view.View.isHapticFeedbackEnabled_added()" class="hiddenlink" target="rightframe"><b>isHapticFeedbackEnabled</b>
+()</A></nobr><br>
+<nobr><A HREF="android.view.View.html#android.view.View.isInEditMode_added()" class="hiddenlink" target="rightframe"><b>isInEditMode</b>
+()</A></nobr><br>
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.isInputMethodTarget_added()" class="hiddenlink" target="rightframe"><b>isInputMethodTarget</b>
+()</A></nobr><br>
+<nobr><A HREF="android.media.MediaPlayer.html#android.media.MediaPlayer.isLooping_added()" class="hiddenlink" target="rightframe"><b>isLooping</b>
+()</A></nobr><br>
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.isOutsideTouchable_added()" class="hiddenlink" target="rightframe"><b>isOutsideTouchable</b>
+()</A></nobr><br>
+<nobr><A HREF="android.widget.AutoCompleteTextView.html#android.widget.AutoCompleteTextView.isPerformingCompletion_added()" class="hiddenlink" target="rightframe"><b>isPerformingCompletion</b>
+()</A></nobr><br>
+<nobr><A HREF="android.net.NetworkInfo.html#android.net.NetworkInfo.isRoaming_added()" class="hiddenlink" target="rightframe"><b>isRoaming</b>
+()</A></nobr><br>
+<i>isSafeMode</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.content.pm.PackageManager.html#android.content.pm.PackageManager.isSafeMode_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.content.pm.PackageManager
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.mock.MockPackageManager.html#android.test.mock.MockPackageManager.isSafeMode_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.test.mock.MockPackageManager
+</A></nobr><br>
+<nobr><A HREF="android.text.method.MetaKeyKeyListener.html#android.text.method.MetaKeyKeyListener.isSelectingMetaTracker_added(java.lang.CharSequence, java.lang.Object)" class="hiddenlink" target="rightframe"><b>isSelectingMetaTracker</b>
+(<code>CharSequence, Object</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.AbsListView.html#android.widget.AbsListView.isSmoothScrollbarEnabled_added()" class="hiddenlink" target="rightframe"><b>isSmoothScrollbarEnabled</b>
+()</A></nobr><br>
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.isTouchable_added()" class="hiddenlink" target="rightframe"><b>isTouchable</b>
+()</A></nobr><br>
+<A NAME="L"></A>
+<br><font size="+2">L</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.test.InstrumentationTestCase.html#android.test.InstrumentationTestCase.launchActivityWithIntent_added(java.lang.String, java.lang.Class<T>, android.content.Intent)" class="hiddenlink" target="rightframe"><b>launchActivityWithIntent</b>
+(<code>String, Class&lt;T&gt;, Intent</code>)</A></nobr><br>
+<i>load</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.media.SoundPool.html#android.media.SoundPool.load_added(android.content.res.AssetFileDescriptor, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>AssetFileDescriptor, int</code>)</b>&nbsp;in&nbsp;android.media.SoundPool
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.media.SoundPool.html#android.media.SoundPool.load_added(java.io.FileDescriptor, long, long, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>FileDescriptor, long, long, int</code>)</b>&nbsp;in&nbsp;android.media.SoundPool
+</A></nobr><br>
+<nobr><A HREF="dalvik.system.DexFile.html#dalvik.system.DexFile.loadDex_added(java.lang.String, java.lang.String, int)" class="hiddenlink" target="rightframe"><b>loadDex</b>
+(<code>String, String, int</code>)</A></nobr><br>
+<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.longClickView_added(android.test.InstrumentationTestCase, android.view.View)" class="hiddenlink" target="rightframe"><b>longClickView</b>
+(<code>InstrumentationTestCase, View</code>)</A></nobr><br>
+<A NAME="M"></A>
+<br><font size="+2">M</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.app.LauncherActivity.html#android.app.LauncherActivity.makeListItems_added()" class="hiddenlink" target="rightframe"><b>makeListItems</b>
+()</A></nobr><br>
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.mayUseInputMethod_added(int)" class="hiddenlink" target="rightframe"><b>mayUseInputMethod</b>
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.moveCursorToVisibleOffset_added()" class="hiddenlink" target="rightframe"><b>moveCursorToVisibleOffset</b>
+()</A></nobr><br>
+<nobr><A HREF="android.graphics.drawable.Drawable.html#android.graphics.drawable.Drawable.mutate_added()" class="hiddenlink" target="rightframe"><b>mutate</b>
+()</A></nobr><br>
+<A NAME="O"></A>
+<br><font size="+2">O</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.onBeginBatchEdit_added()" class="hiddenlink" target="rightframe"><b>onBeginBatchEdit</b>
+()</A></nobr><br>
+<nobr><A HREF="android.view.View.html#android.view.View.onCheckIsTextEditor_added()" class="hiddenlink" target="rightframe"><b>onCheckIsTextEditor</b>
+()</A></nobr><br>
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.onCommitCompletion_added(android.view.inputmethod.CompletionInfo)" class="hiddenlink" target="rightframe"><b>onCommitCompletion</b>
+(<code>CompletionInfo</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.CursorAdapter.html#android.widget.CursorAdapter.onContentChanged_added()" class="hiddenlink" target="rightframe"><b>onContentChanged</b>
+()</A></nobr><br>
+<nobr><A HREF="android.view.View.html#android.view.View.onCreateInputConnection_added(android.view.inputmethod.EditorInfo)" class="hiddenlink" target="rightframe"><b>onCreateInputConnection</b>
+(<code>EditorInfo</code>)</A></nobr><br>
+<nobr><A HREF="android.view.GestureDetector.SimpleOnGestureListener.html#android.view.GestureDetector.SimpleOnGestureListener.onDoubleTap_added(android.view.MotionEvent)" class="hiddenlink" target="rightframe"><b>onDoubleTap</b>
+(<code>MotionEvent</code>)</A></nobr><br>
+<nobr><A HREF="android.view.GestureDetector.SimpleOnGestureListener.html#android.view.GestureDetector.SimpleOnGestureListener.onDoubleTapEvent_added(android.view.MotionEvent)" class="hiddenlink" target="rightframe"><b>onDoubleTapEvent</b>
+(<code>MotionEvent</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.onEditorAction_added(int)" class="hiddenlink" target="rightframe"><b>onEditorAction</b>
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.onEndBatchEdit_added()" class="hiddenlink" target="rightframe"><b>onEndBatchEdit</b>
+()</A></nobr><br>
+<nobr><A HREF="android.view.View.html#android.view.View.onFinishTemporaryDetach_added()" class="hiddenlink" target="rightframe"><b>onFinishTemporaryDetach</b>
+()</A></nobr><br>
+<i>onKeyOther</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.ArrowKeyMovementMethod.html#android.text.method.ArrowKeyMovementMethod.onKeyOther_added(android.widget.TextView, android.text.Spannable, android.view.KeyEvent)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>TextView, Spannable, KeyEvent</code>)</b>&nbsp;in&nbsp;android.text.method.ArrowKeyMovementMethod
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.BaseKeyListener.html#android.text.method.BaseKeyListener.onKeyOther_added(android.view.View, android.text.Editable, android.view.KeyEvent)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>View, Editable, KeyEvent</code>)</b>&nbsp;in&nbsp;android.text.method.BaseKeyListener
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.KeyListener.html#android.text.method.KeyListener.onKeyOther_added(android.view.View, android.text.Editable, android.view.KeyEvent)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>View, Editable, KeyEvent</code>)</b>&nbsp;in&nbsp;android.text.method.KeyListener
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.MovementMethod.html#android.text.method.MovementMethod.onKeyOther_added(android.widget.TextView, android.text.Spannable, android.view.KeyEvent)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>TextView, Spannable, KeyEvent</code>)</b>&nbsp;in&nbsp;android.text.method.MovementMethod
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.ScrollingMovementMethod.html#android.text.method.ScrollingMovementMethod.onKeyOther_added(android.widget.TextView, android.text.Spannable, android.view.KeyEvent)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>TextView, Spannable, KeyEvent</code>)</b>&nbsp;in&nbsp;android.text.method.ScrollingMovementMethod
+</A></nobr><br>
+<nobr><A HREF="android.view.View.html#android.view.View.onKeyPreIme_added(int, android.view.KeyEvent)" class="hiddenlink" target="rightframe"><b>onKeyPreIme</b>
+(<code>int, KeyEvent</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.onPrivateIMECommand_added(java.lang.String, android.os.Bundle)" class="hiddenlink" target="rightframe"><b>onPrivateIMECommand</b>
+(<code>String, Bundle</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.onSelectionChanged_added(int, int)" class="hiddenlink" target="rightframe"><b>onSelectionChanged</b>
+(<code>int, int</code>)</A></nobr><br>
+<nobr><A HREF="android.view.GestureDetector.SimpleOnGestureListener.html#android.view.GestureDetector.SimpleOnGestureListener.onSingleTapConfirmed_added(android.view.MotionEvent)" class="hiddenlink" target="rightframe"><b>onSingleTapConfirmed</b>
+(<code>MotionEvent</code>)</A></nobr><br>
+<nobr><A HREF="android.view.View.html#android.view.View.onStartTemporaryDetach_added()" class="hiddenlink" target="rightframe"><b>onStartTemporaryDetach</b>
+()</A></nobr><br>
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.onTextContextMenuItem_added(int)" class="hiddenlink" target="rightframe"><b>onTextContextMenuItem</b>
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.app.Activity.html#android.app.Activity.onUserInteraction_added()" class="hiddenlink" target="rightframe"><b>onUserInteraction</b>
+()</A></nobr><br>
+<nobr><A HREF="android.app.Activity.html#android.app.Activity.onUserLeaveHint_added()" class="hiddenlink" target="rightframe"><b>onUserLeaveHint</b>
+()</A></nobr><br>
+<nobr><A HREF="android.content.ContentProvider.html#android.content.ContentProvider.openAssetFile_added(android.net.Uri, java.lang.String)" class="hiddenlink" target="rightframe"><b>openAssetFile</b>
+(<code>Uri, String</code>)</A></nobr><br>
+<nobr><A HREF="android.content.ContentResolver.html#android.content.ContentResolver.openAssetFileDescriptor_added(android.net.Uri, java.lang.String)" class="hiddenlink" target="rightframe"><b>openAssetFileDescriptor</b>
+(<code>Uri, String</code>)</A></nobr><br>
+<nobr><A HREF="android.content.ContentResolver.html#android.content.ContentResolver.openOutputStream_added(android.net.Uri, java.lang.String)" class="hiddenlink" target="rightframe"><b>openOutputStream</b>
+(<code>Uri, String</code>)</A></nobr><br>
+<nobr><A HREF="android.content.res.Resources.html#android.content.res.Resources.openRawResource_added(int, android.util.TypedValue)" class="hiddenlink" target="rightframe"><b>openRawResource</b>
+(<code>int, TypedValue</code>)</A></nobr><br>
+<A NAME="P"></A>
+<br><font size="+2">P</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.content.res.Resources.html#android.content.res.Resources.parseBundleExtra_added(java.lang.String, android.util.AttributeSet, android.os.Bundle)" class="hiddenlink" target="rightframe"><b>parseBundleExtra</b>
+(<code>String, AttributeSet, Bundle</code>)</A></nobr><br>
+<nobr><A HREF="android.content.res.Resources.html#android.content.res.Resources.parseBundleExtras_added(android.content.res.XmlResourceParser, android.os.Bundle)" class="hiddenlink" target="rightframe"><b>parseBundleExtras</b>
+(<code>XmlResourceParser, Bundle</code>)</A></nobr><br>
+<nobr><A HREF="android.content.BroadcastReceiver.html#android.content.BroadcastReceiver.peekService_added(android.content.Context, android.content.Intent)" class="hiddenlink" target="rightframe"><b>peekService</b>
+(<code>Context, Intent</code>)</A></nobr><br>
+<i>performHapticFeedback</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.view.View.html#android.view.View.performHapticFeedback_added(int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>int</code>)</b>&nbsp;in&nbsp;android.view.View
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.view.View.html#android.view.View.performHapticFeedback_added(int, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>int, int</code>)</b>&nbsp;in&nbsp;android.view.View
+</A></nobr><br>
+<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.playSoundEffect_added(int, float)" class="hiddenlink" target="rightframe"><b>playSoundEffect</b>
+(<code>int, float</code>)</A></nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.putLong_added(android.content.ContentResolver, java.lang.String, long)" class="hiddenlink" target="rightframe"><b>putLong</b>
+(<code>ContentResolver, String, long</code>)</A></nobr><br>
+<A NAME="R"></A>
+<br><font size="+2">R</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.graphics.RectF.html#android.graphics.RectF.readFromParcel_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>readFromParcel</b>
+(<code>Parcel</code>)</A></nobr><br>
+<i>registerListener</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.registerListener_added(android.hardware.SensorEventListener, android.hardware.Sensor, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>SensorEventListener, Sensor, int</code>)</b>&nbsp;in&nbsp;android.hardware.SensorManager
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.registerListener_added(android.hardware.SensorEventListener, android.hardware.Sensor, int, android.os.Handler)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>SensorEventListener, Sensor, int, Handler</code>)</b>&nbsp;in&nbsp;android.hardware.SensorManager
+</A></nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.remapCoordinateSystem_added(float[], int, int, float[])" class="hiddenlink" target="rightframe"><b>remapCoordinateSystem</b>
+(<code>float[], int, int, float[]</code>)</A></nobr><br>
+<nobr><A HREF="android.util.SparseIntArray.html#android.util.SparseIntArray.removeAt_added(int)" class="hiddenlink" target="rightframe"><b>removeAt</b>
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.removeGpsStatusListener_added(android.location.GpsStatus.Listener)" class="hiddenlink" target="rightframe"><b>removeGpsStatusListener</b>
+(<code>Listener</code>)</A></nobr><br>
+<nobr><A HREF="android.view.ViewTreeObserver.html#android.view.ViewTreeObserver.removeOnScrollChangedListener_added(android.view.ViewTreeObserver.OnScrollChangedListener)" class="hiddenlink" target="rightframe"><b>removeOnScrollChangedListener</b>
+(<code>OnScrollChangedListener</code>)</A></nobr><br>
+<i>removePropertyChangeListener</i><br>
+&nbsp;&nbsp;<nobr><A HREF="java.util.jar.Pack200.Packer.html#java.util.jar.Pack200.Packer.removePropertyChangeListener_added(java.beans.PropertyChangeListener)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>PropertyChangeListener</code>)</b>&nbsp;in&nbsp;java.util.jar.Pack200.Packer
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="java.util.jar.Pack200.Unpacker.html#java.util.jar.Pack200.Unpacker.removePropertyChangeListener_added(java.beans.PropertyChangeListener)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>PropertyChangeListener</code>)</b>&nbsp;in&nbsp;java.util.jar.Pack200.Unpacker
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="java.util.logging.LogManager.html#java.util.logging.LogManager.removePropertyChangeListener_added(java.beans.PropertyChangeListener)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>PropertyChangeListener</code>)</b>&nbsp;in&nbsp;java.util.logging.LogManager
+</A></nobr><br>
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.removeTestProvider_added(java.lang.String)" class="hiddenlink" target="rightframe"><b>removeTestProvider</b>
+(<code>String</code>)</A></nobr><br>
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.removeUpdates_added(android.app.PendingIntent)" class="hiddenlink" target="rightframe"><b>removeUpdates</b>
+(<code>PendingIntent</code>)</A></nobr><br>
+<i>replaceExtras</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.content.Intent.html#android.content.Intent.replaceExtras_added(android.content.Intent)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Intent</code>)</b>&nbsp;in&nbsp;android.content.Intent
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.content.Intent.html#android.content.Intent.replaceExtras_added(android.os.Bundle)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Bundle</code>)</b>&nbsp;in&nbsp;android.content.Intent
+</A></nobr><br>
+<nobr><A HREF="android.view.ViewParent.html#android.view.ViewParent.requestChildRectangleOnScreen_added(android.view.View, android.graphics.Rect, boolean)" class="hiddenlink" target="rightframe"><b>requestChildRectangleOnScreen</b>
+(<code>View, Rect, boolean</code>)</A></nobr><br>
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.requestLocationUpdates_added(java.lang.String, long, float, android.app.PendingIntent)" class="hiddenlink" target="rightframe"><b>requestLocationUpdates</b>
+(<code>String, long, float, PendingIntent</code>)</A></nobr><br>
+<nobr><A HREF="android.text.method.MetaKeyKeyListener.html#android.text.method.MetaKeyKeyListener.resetLockedMeta_added(long)" class="hiddenlink" target="rightframe"><b>resetLockedMeta</b>
+(<code>long</code>)</A></nobr><br>
+<nobr><A HREF="android.app.ActivityManager.html#android.app.ActivityManager.restartPackage_added(java.lang.String)" class="hiddenlink" target="rightframe"><b>restartPackage</b>
+(<code>String</code>)</A></nobr><br>
+<nobr><A HREF="android.webkit.WebView.html#android.webkit.WebView.restorePicture_added(android.os.Bundle, java.io.File)" class="hiddenlink" target="rightframe"><b>restorePicture</b>
+(<code>Bundle, File</code>)</A></nobr><br>
+<nobr><A HREF="android.test.InstrumentationTestCase.html#android.test.InstrumentationTestCase.runTestOnUiThread_added(java.lang.Runnable)" class="hiddenlink" target="rightframe"><b>runTestOnUiThread</b>
+(<code>Runnable</code>)</A></nobr><br>
+<A NAME="S"></A>
+<br><font size="+2">S</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.webkit.WebView.html#android.webkit.WebView.savePicture_added(android.os.Bundle, java.io.File)" class="hiddenlink" target="rightframe"><b>savePicture</b>
+(<code>Bundle, File</code>)</A></nobr><br>
+<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.scrollToBottom_added(android.test.InstrumentationTestCase, android.app.Activity, android.view.ViewGroup)" class="hiddenlink" target="rightframe"><b>scrollToBottom</b>
+(<code>InstrumentationTestCase, Activity, ViewGroup</code>)</A></nobr><br>
+<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.scrollToTop_added(android.test.InstrumentationTestCase, android.app.Activity, android.view.ViewGroup)" class="hiddenlink" target="rightframe"><b>scrollToTop</b>
+(<code>InstrumentationTestCase, Activity, ViewGroup</code>)</A></nobr><br>
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.sendExtraCommand_added(java.lang.String, java.lang.String, android.os.Bundle)" class="hiddenlink" target="rightframe"><b>sendExtraCommand</b>
+(<code>String, String, Bundle</code>)</A></nobr><br>
+<nobr><A HREF="android.webkit.WebSettings.html#android.webkit.WebSettings.setAllowFileAccess_added(boolean)" class="hiddenlink" target="rightframe"><b>setAllowFileAccess</b>
+(<code>boolean</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setBitmap_added(int, java.lang.String, android.graphics.Bitmap)" class="hiddenlink" target="rightframe"><b>setBitmap</b>
+(<code>int, String, Bitmap</code>)</A></nobr><br>
+<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.setBluetoothA2dpOn_added(boolean)" class="hiddenlink" target="rightframe"><b>setBluetoothA2dpOn</b>
+(<code>boolean</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setBoolean_added(int, java.lang.String, boolean)" class="hiddenlink" target="rightframe"><b>setBoolean</b>
+(<code>int, String, boolean</code>)</A></nobr><br>
+<nobr><A HREF="android.webkit.WebSettings.html#android.webkit.WebSettings.setBuiltInZoomControls_added(boolean)" class="hiddenlink" target="rightframe"><b>setBuiltInZoomControls</b>
+(<code>boolean</code>)</A></nobr><br>
+<i>setButton</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.app.AlertDialog.html#android.app.AlertDialog.setButton_added(java.lang.CharSequence, android.content.DialogInterface.OnClickListener)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>CharSequence, OnClickListener</code>)</b>&nbsp;in&nbsp;android.app.AlertDialog
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.app.AlertDialog.html#android.app.AlertDialog.setButton_added(java.lang.CharSequence, android.os.Message)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>CharSequence, Message</code>)</b>&nbsp;in&nbsp;android.app.AlertDialog
+</A></nobr><br>
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setByte_added(int, java.lang.String, byte)" class="hiddenlink" target="rightframe"><b>setByte</b>
+(<code>int, String, byte</code>)</A></nobr><br>
+<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.setCamera_added(android.hardware.Camera)" class="hiddenlink" target="rightframe"><b>setCamera</b>
+(<code>Camera</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setChar_added(int, java.lang.String, char)" class="hiddenlink" target="rightframe"><b>setChar</b>
+(<code>int, String, char</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setCharSequence_added(int, java.lang.String, java.lang.CharSequence)" class="hiddenlink" target="rightframe"><b>setCharSequence</b>
+(<code>int, String, CharSequence</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.setClippingEnabled_added(boolean)" class="hiddenlink" target="rightframe"><b>setClippingEnabled</b>
+(<code>boolean</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.setCompoundDrawablesWithIntrinsicBounds_added(int, int, int, int)" class="hiddenlink" target="rightframe"><b>setCompoundDrawablesWithIntrinsicBounds</b>
+(<code>int, int, int, int</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setDouble_added(int, java.lang.String, double)" class="hiddenlink" target="rightframe"><b>setDouble</b>
+(<code>int, String, double</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.AutoCompleteTextView.html#android.widget.AutoCompleteTextView.setDropDownAnchor_added(int)" class="hiddenlink" target="rightframe"><b>setDropDownAnchor</b>
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.AutoCompleteTextView.html#android.widget.AutoCompleteTextView.setDropDownWidth_added(int)" class="hiddenlink" target="rightframe"><b>setDropDownWidth</b>
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.setExtractedText_added(android.view.inputmethod.ExtractedText)" class="hiddenlink" target="rightframe"><b>setExtractedText</b>
+(<code>ExtractedText</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.AbsListView.html#android.widget.AbsListView.setFastScrollEnabled_added(boolean)" class="hiddenlink" target="rightframe"><b>setFastScrollEnabled</b>
+(<code>boolean</code>)</A></nobr><br>
+<nobr><A HREF="android.view.animation.Animation.html#android.view.animation.Animation.setFillEnabled_added(boolean)" class="hiddenlink" target="rightframe"><b>setFillEnabled</b>
+(<code>boolean</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setFloat_added(int, java.lang.String, float)" class="hiddenlink" target="rightframe"><b>setFloat</b>
+(<code>int, String, float</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.ListView.html#android.widget.ListView.setFooterDividersEnabled_added(boolean)" class="hiddenlink" target="rightframe"><b>setFooterDividersEnabled</b>
+(<code>boolean</code>)</A></nobr><br>
+<nobr><A HREF="android.view.View.html#android.view.View.setHapticFeedbackEnabled_added(boolean)" class="hiddenlink" target="rightframe"><b>setHapticFeedbackEnabled</b>
+(<code>boolean</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.ListView.html#android.widget.ListView.setHeaderDividersEnabled_added(boolean)" class="hiddenlink" target="rightframe"><b>setHeaderDividersEnabled</b>
+(<code>boolean</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setImageViewBitmap_added(int, android.graphics.Bitmap)" class="hiddenlink" target="rightframe"><b>setImageViewBitmap</b>
+(<code>int, Bitmap</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.setImeActionLabel_added(java.lang.CharSequence, int)" class="hiddenlink" target="rightframe"><b>setImeActionLabel</b>
+(<code>CharSequence, int</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.setImeOptions_added(int)" class="hiddenlink" target="rightframe"><b>setImeOptions</b>
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.app.AlarmManager.html#android.app.AlarmManager.setInexactRepeating_added(int, long, long, android.app.PendingIntent)" class="hiddenlink" target="rightframe"><b>setInexactRepeating</b>
+(<code>int, long, long, PendingIntent</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.setInputExtras_added(int)" class="hiddenlink" target="rightframe"><b>setInputExtras</b>
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.setInputMethodMode_added(int)" class="hiddenlink" target="rightframe"><b>setInputMethodMode</b>
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.setInputType_added(int)" class="hiddenlink" target="rightframe"><b>setInputType</b>
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setInt_added(int, java.lang.String, int)" class="hiddenlink" target="rightframe"><b>setInt</b>
+(<code>int, String, int</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.AbsSeekBar.html#android.widget.AbsSeekBar.setKeyProgressIncrement_added(int)" class="hiddenlink" target="rightframe"><b>setKeyProgressIncrement</b>
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.AutoCompleteTextView.html#android.widget.AutoCompleteTextView.setListSelection_added(int)" class="hiddenlink" target="rightframe"><b>setListSelection</b>
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setLong_added(int, java.lang.String, long)" class="hiddenlink" target="rightframe"><b>setLong</b>
+(<code>int, String, long</code>)</A></nobr><br>
+<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.setMaxDuration_added(int)" class="hiddenlink" target="rightframe"><b>setMaxDuration</b>
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.setMaxFileSize_added(long)" class="hiddenlink" target="rightframe"><b>setMaxFileSize</b>
+(<code>long</code>)</A></nobr><br>
+<nobr><A HREF="android.webkit.WebView.html#android.webkit.WebView.setNetworkAvailable_added(boolean)" class="hiddenlink" target="rightframe"><b>setNetworkAvailable</b>
+(<code>boolean</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.Chronometer.html#android.widget.Chronometer.setOnChronometerTickListener_added(android.widget.Chronometer.OnChronometerTickListener)" class="hiddenlink" target="rightframe"><b>setOnChronometerTickListener</b>
+(<code>OnChronometerTickListener</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setOnClickPendingIntent_added(int, android.app.PendingIntent)" class="hiddenlink" target="rightframe"><b>setOnClickPendingIntent</b>
+(<code>int, PendingIntent</code>)</A></nobr><br>
+<nobr><A HREF="android.view.GestureDetector.html#android.view.GestureDetector.setOnDoubleTapListener_added(android.view.GestureDetector.OnDoubleTapListener)" class="hiddenlink" target="rightframe"><b>setOnDoubleTapListener</b>
+(<code>OnDoubleTapListener</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.setOnEditorActionListener_added(android.widget.TextView.OnEditorActionListener)" class="hiddenlink" target="rightframe"><b>setOnEditorActionListener</b>
+(<code>OnEditorActionListener</code>)</A></nobr><br>
+<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.setOnErrorListener_added(android.media.MediaRecorder.OnErrorListener)" class="hiddenlink" target="rightframe"><b>setOnErrorListener</b>
+(<code>OnErrorListener</code>)</A></nobr><br>
+<nobr><A HREF="android.hardware.Camera.html#android.hardware.Camera.setOneShotPreviewCallback_added(android.hardware.Camera.PreviewCallback)" class="hiddenlink" target="rightframe"><b>setOneShotPreviewCallback</b>
+(<code>PreviewCallback</code>)</A></nobr><br>
+<i>setOnInfoListener</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.media.MediaPlayer.html#android.media.MediaPlayer.setOnInfoListener_added(android.media.MediaPlayer.OnInfoListener)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>OnInfoListener</code>)</b>&nbsp;in&nbsp;android.media.MediaPlayer
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.setOnInfoListener_added(android.media.MediaRecorder.OnInfoListener)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>OnInfoListener</code>)</b>&nbsp;in&nbsp;android.media.MediaRecorder
+</A></nobr><br>
+<nobr><A HREF="android.media.MediaPlayer.html#android.media.MediaPlayer.setOnVideoSizeChangedListener_added(android.media.MediaPlayer.OnVideoSizeChangedListener)" class="hiddenlink" target="rightframe"><b>setOnVideoSizeChangedListener</b>
+(<code>OnVideoSizeChangedListener</code>)</A></nobr><br>
+<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.setOutputFile_added(java.io.FileDescriptor)" class="hiddenlink" target="rightframe"><b>setOutputFile</b>
+(<code>FileDescriptor</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.setOutsideTouchable_added(boolean)" class="hiddenlink" target="rightframe"><b>setOutsideTouchable</b>
+(<code>boolean</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.setPrivateImeOptions_added(java.lang.String)" class="hiddenlink" target="rightframe"><b>setPrivateImeOptions</b>
+(<code>String</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.setRawInputType_added(int)" class="hiddenlink" target="rightframe"><b>setRawInputType</b>
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.view.View.html#android.view.View.setScrollContainer_added(boolean)" class="hiddenlink" target="rightframe"><b>setScrollContainer</b>
+(<code>boolean</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setShort_added(int, java.lang.String, short)" class="hiddenlink" target="rightframe"><b>setShort</b>
+(<code>int, String, short</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.AbsListView.html#android.widget.AbsListView.setSmoothScrollbarEnabled_added(boolean)" class="hiddenlink" target="rightframe"><b>setSmoothScrollbarEnabled</b>
+(<code>boolean</code>)</A></nobr><br>
+<nobr><A HREF="android.view.Window.html#android.view.Window.setSoftInputMode_added(int)" class="hiddenlink" target="rightframe"><b>setSoftInputMode</b>
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.view.ViewGroup.html#android.view.ViewGroup.setStaticTransformationsEnabled_added(boolean)" class="hiddenlink" target="rightframe"><b>setStaticTransformationsEnabled</b>
+(<code>boolean</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setString_added(int, java.lang.String, java.lang.String)" class="hiddenlink" target="rightframe"><b>setString</b>
+(<code>int, String, String</code>)</A></nobr><br>
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.setTestProviderEnabled_added(java.lang.String, boolean)" class="hiddenlink" target="rightframe"><b>setTestProviderEnabled</b>
+(<code>String, boolean</code>)</A></nobr><br>
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.setTestProviderLocation_added(java.lang.String, android.location.Location)" class="hiddenlink" target="rightframe"><b>setTestProviderLocation</b>
+(<code>String, Location</code>)</A></nobr><br>
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.setTestProviderStatus_added(java.lang.String, int, android.os.Bundle, long)" class="hiddenlink" target="rightframe"><b>setTestProviderStatus</b>
+(<code>String, int, Bundle, long</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setTextColor_added(int, int)" class="hiddenlink" target="rightframe"><b>setTextColor</b>
+(<code>int, int</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.setTouchable_added(boolean)" class="hiddenlink" target="rightframe"><b>setTouchable</b>
+(<code>boolean</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.setTouchInterceptor_added(android.view.View.OnTouchListener)" class="hiddenlink" target="rightframe"><b>setTouchInterceptor</b>
+(<code>OnTouchListener</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setUri_added(int, java.lang.String, android.net.Uri)" class="hiddenlink" target="rightframe"><b>setUri</b>
+(<code>int, String, Uri</code>)</A></nobr><br>
+<nobr><A HREF="android.webkit.WebSettings.html#android.webkit.WebSettings.setUserAgentString_added(java.lang.String)" class="hiddenlink" target="rightframe"><b>setUserAgentString</b>
+(<code>String</code>)</A></nobr><br>
+<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.setVideoEncoder_added(int)" class="hiddenlink" target="rightframe"><b>setVideoEncoder</b>
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.setVideoFrameRate_added(int)" class="hiddenlink" target="rightframe"><b>setVideoFrameRate</b>
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.setVideoSize_added(int, int)" class="hiddenlink" target="rightframe"><b>setVideoSize</b>
+(<code>int, int</code>)</A></nobr><br>
+<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.setVideoSource_added(int)" class="hiddenlink" target="rightframe"><b>setVideoSource</b>
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.app.AlertDialog.html#android.app.AlertDialog.setView_added(android.view.View, int, int, int, int)" class="hiddenlink" target="rightframe"><b>setView</b>
+(<code>View, int, int, int, int</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.ResourceCursorAdapter.html#android.widget.ResourceCursorAdapter.setViewResource_added(int)" class="hiddenlink" target="rightframe"><b>setViewResource</b>
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.app.Activity.html#android.app.Activity.setVisible_added(boolean)" class="hiddenlink" target="rightframe"><b>setVisible</b>
+(<code>boolean</code>)</A></nobr><br>
+<nobr><A HREF="android.view.Window.html#android.view.Window.setWindowAnimations_added(int)" class="hiddenlink" target="rightframe"><b>setWindowAnimations</b>
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.setWindowLayoutMode_added(int, int)" class="hiddenlink" target="rightframe"><b>setWindowLayoutMode</b>
+(<code>int, int</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.ArrayAdapter.html#android.widget.ArrayAdapter.sort_added(java.util.Comparator<? super T>)" class="hiddenlink" target="rightframe"><b>sort</b>
+(<code>Comparator&lt;? super T&gt;</code>)</A></nobr><br>
+<A NAME="T"></A>
+<br><font size="+2">T</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<i>toShortString</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.graphics.Rect.html#android.graphics.Rect.toShortString_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.graphics.Rect
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.view.animation.Transformation.html#android.view.animation.Transformation.toShortString_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.view.animation.Transformation
+</A></nobr><br>
+<A NAME="U"></A>
+<br><font size="+2">U</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<i>unregisterListener</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.unregisterListener_added(android.hardware.SensorEventListener)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>SensorEventListener</code>)</b>&nbsp;in&nbsp;android.hardware.SensorManager
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.unregisterListener_added(android.hardware.SensorEventListener, android.hardware.Sensor)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>SensorEventListener, Sensor</code>)</b>&nbsp;in&nbsp;android.hardware.SensorManager
+</A></nobr><br>
+<i>update</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.update_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.widget.PopupWindow
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.update_added(int, int, int, int, boolean)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>int, int, int, int, boolean</code>)</b>&nbsp;in&nbsp;android.widget.PopupWindow
+</A></nobr><br>
+<A NAME="W"></A>
+<br><font size="+2">W</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<i>writeToParcel</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.content.res.AssetFileDescriptor.html#android.content.res.AssetFileDescriptor.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.content.res.AssetFileDescriptor
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.graphics.RectF.html#android.graphics.RectF.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.graphics.RectF
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.Annotation.html#android.text.Annotation.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.Annotation
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.AbsoluteSizeSpan.html#android.text.style.AbsoluteSizeSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.AbsoluteSizeSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.AlignmentSpan.Standard.html#android.text.style.AlignmentSpan.Standard.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.AlignmentSpan.Standard
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.BackgroundColorSpan.html#android.text.style.BackgroundColorSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.BackgroundColorSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.BulletSpan.html#android.text.style.BulletSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.BulletSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.ForegroundColorSpan.html#android.text.style.ForegroundColorSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.ForegroundColorSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.LeadingMarginSpan.Standard.html#android.text.style.LeadingMarginSpan.Standard.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.LeadingMarginSpan.Standard
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.QuoteSpan.html#android.text.style.QuoteSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.QuoteSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.RelativeSizeSpan.html#android.text.style.RelativeSizeSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.RelativeSizeSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.ScaleXSpan.html#android.text.style.ScaleXSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.ScaleXSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.StrikethroughSpan.html#android.text.style.StrikethroughSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.StrikethroughSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.StyleSpan.html#android.text.style.StyleSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.StyleSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.SubscriptSpan.html#android.text.style.SubscriptSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.SubscriptSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.SuperscriptSpan.html#android.text.style.SuperscriptSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.SuperscriptSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.TextAppearanceSpan.html#android.text.style.TextAppearanceSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.TextAppearanceSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.TypefaceSpan.html#android.text.style.TypefaceSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.TypefaceSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.URLSpan.html#android.text.style.URLSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.URLSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.UnderlineSpan.html#android.text.style.UnderlineSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.UnderlineSpan
+</A></nobr><br>
+<A NAME="Y"></A>
+<br><font size="+2">Y</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.database.sqlite.SQLiteDatabase.html#android.database.sqlite.SQLiteDatabase.yieldIfContendedSafely_added()" class="hiddenlink" target="rightframe"><b>yieldIfContendedSafely</b>
+()</A></nobr><br>
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/methods_index_all.html b/docs/html/sdk/api_diff/3/changes/methods_index_all.html
new file mode 100644
index 000000000000..22492a352290
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/methods_index_all.html
@@ -0,0 +1,1600 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+Method Differences Index
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY class="gc-documentation">
+<a NAME="topheader"></a>
+<table summary="Index for Methods" width="100%" class="jdiffIndex" border="0" cellspacing="0" cellpadding="0" style="padding-bottom:0;margin-bottom:0;">
+  <tr>
+  <th class="indexHeader">
+    Filter the Index:
+  </th>
+  </tr>
+  <tr>
+  <td class="indexText" style="line-height:1.3em;padding-left:2em;">
+<b>Methods</b>
+  <br>
+<font color="#999999">Removals</font>
+  <br>
+<A HREF="methods_index_additions.html"xclass="hiddenlink">Additions</A>
+  <br>
+<A HREF="methods_index_changes.html"xclass="hiddenlink">Changes</A>
+  </td>
+  </tr>
+</table>
+<div id="indexTableCaption">
+<font size="-2"><strong>Bold</strong>&nbsp;indicates&nbsp;New;&nbsp;<strike>Strike</strike>&nbsp;indicates&nbsp;deleted. Plain indicates changed.</font>
+</div>
+<A NAME="A"></A>
+<br><font size="+2">A</font>&nbsp;
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.addGpsStatusListener_added(android.location.GpsStatus.Listener)" class="hiddenlink" target="rightframe"><b>addGpsStatusListener</b>
+(<code>Listener</code>)</A></nobr><br>
+<nobr><A HREF="android.view.ViewTreeObserver.html#android.view.ViewTreeObserver.addOnScrollChangedListener_added(android.view.ViewTreeObserver.OnScrollChangedListener)" class="hiddenlink" target="rightframe"><b>addOnScrollChangedListener</b>
+(<code>OnScrollChangedListener</code>)</A></nobr><br>
+<i>addPropertyChangeListener</i><br>
+&nbsp;&nbsp;<nobr><A HREF="java.util.jar.Pack200.Packer.html#java.util.jar.Pack200.Packer.addPropertyChangeListener_added(java.beans.PropertyChangeListener)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>PropertyChangeListener</code>)</b>&nbsp;in&nbsp;java.util.jar.Pack200.Packer
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="java.util.jar.Pack200.Unpacker.html#java.util.jar.Pack200.Unpacker.addPropertyChangeListener_added(java.beans.PropertyChangeListener)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>PropertyChangeListener</code>)</b>&nbsp;in&nbsp;java.util.jar.Pack200.Unpacker
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="java.util.logging.LogManager.html#java.util.logging.LogManager.addPropertyChangeListener_added(java.beans.PropertyChangeListener)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>PropertyChangeListener</code>)</b>&nbsp;in&nbsp;java.util.logging.LogManager
+</A></nobr><br>
+<nobr><A HREF="android.test.suitebuilder.TestSuiteBuilder.html#android.test.suitebuilder.TestSuiteBuilder.addRequirements_changed(com.android.internal.util.Predicate<android.test.suitebuilder.TestMethod>...)" class="hiddenlink" target="rightframe">addRequirements
+(<code>Predicate&lt;TestMethod&gt;</code>)</A></nobr><br>
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.addTestProvider_added(java.lang.String, boolean, boolean, boolean, boolean, boolean, boolean, boolean, int, int)" class="hiddenlink" target="rightframe"><b>addTestProvider</b>
+(<code>String, boolean, boolean, boolean, boolean, boolean, boolean, boolean, int, int</code>)</A></nobr><br>
+<nobr><A HREF="android.text.method.MetaKeyKeyListener.html#android.text.method.MetaKeyKeyListener.adjustMetaAfterKeypress_added(long)" class="hiddenlink" target="rightframe"><b>adjustMetaAfterKeypress</b>
+(<code>long</code>)</A></nobr><br>
+<nobr><A HREF="android.database.DatabaseUtils.html#android.database.DatabaseUtils.appendEscapedSQLString_changed(java.lang.StringBuilder, java.lang.String)" class="hiddenlink" target="rightframe">appendEscapedSQLString
+(<code>StringBuilder, String</code>)</A></nobr><br>
+<nobr><A HREF="android.view.Gravity.html#android.view.Gravity.applyDisplay_added(int, android.graphics.Rect, android.graphics.Rect)" class="hiddenlink" target="rightframe"><b>applyDisplay</b>
+(<code>int, Rect, Rect</code>)</A></nobr><br>
+<A NAME="B"></A>
+<br><font size="+2">B</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.beginBatchEdit_added()" class="hiddenlink" target="rightframe"><b>beginBatchEdit</b>
+()</A></nobr><br>
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.bringPointIntoView_added(int)" class="hiddenlink" target="rightframe"><b>bringPointIntoView</b>
+(<code>int</code>)</A></nobr><br>
+<A NAME="C"></A>
+<br><font size="+2">C</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.telephony.gsm.SmsMessage.html#android.telephony.gsm.SmsMessage.calculateLength_added(java.lang.CharSequence, boolean)" class="hiddenlink" target="rightframe"><b>calculateLength</b>
+(<code>CharSequence, boolean</code>)</A></nobr><br>
+<nobr><A HREF="android.app.Instrumentation.html#android.app.Instrumentation.callActivityOnUserLeaving_added(android.app.Activity)" class="hiddenlink" target="rightframe"><b>callActivityOnUserLeaving</b>
+(<code>Activity</code>)</A></nobr><br>
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.changeAction_added(android.view.KeyEvent, int)" class="hiddenlink" target="rightframe"><b>changeAction</b>
+(<code>KeyEvent, int</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.SimpleCursorAdapter.html#android.widget.SimpleCursorAdapter.changeCursorAndColumns_added(android.database.Cursor, java.lang.String[], int[])" class="hiddenlink" target="rightframe"><b>changeCursorAndColumns</b>
+(<code>Cursor, String[], int[]</code>)</A></nobr><br>
+<nobr><A HREF="android.os.Debug.html#android.os.Debug.changeDebugPort_changed(int)" class="hiddenlink" target="rightframe">changeDebugPort
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.changeFlags_added(android.view.KeyEvent, int)" class="hiddenlink" target="rightframe"><b>changeFlags</b>
+(<code>KeyEvent, int</code>)</A></nobr><br>
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.changeTimeRepeat_added(android.view.KeyEvent, long, int)" class="hiddenlink" target="rightframe"><b>changeTimeRepeat</b>
+(<code>KeyEvent, long, int</code>)</A></nobr><br>
+<nobr><A HREF="android.view.View.html#android.view.View.checkInputConnectionProxy_added(android.view.View)" class="hiddenlink" target="rightframe"><b>checkInputConnectionProxy</b>
+(<code>View</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.clearComposingText_added()" class="hiddenlink" target="rightframe"><b>clearComposingText</b>
+()</A></nobr><br>
+<nobr><A HREF="android.widget.AutoCompleteTextView.html#android.widget.AutoCompleteTextView.clearListSelection_added()" class="hiddenlink" target="rightframe"><b>clearListSelection</b>
+()</A></nobr><br>
+<nobr><A HREF="android.webkit.WebView.html#android.webkit.WebView.clearMatches_added()" class="hiddenlink" target="rightframe"><b>clearMatches</b>
+()</A></nobr><br>
+<i>clearMetaKeyState</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.KeyListener.html#android.text.method.KeyListener.clearMetaKeyState_added(android.view.View, android.text.Editable, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>View, Editable, int</code>)</b>&nbsp;in&nbsp;android.text.method.KeyListener
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.MetaKeyKeyListener.html#android.text.method.MetaKeyKeyListener.clearMetaKeyState_added(long, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>long, int</code>)</b>&nbsp;in&nbsp;android.text.method.MetaKeyKeyListener
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.MetaKeyKeyListener.html#android.text.method.MetaKeyKeyListener.clearMetaKeyState_added(android.view.View, android.text.Editable, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>View, Editable, int</code>)</b>&nbsp;in&nbsp;android.text.method.MetaKeyKeyListener
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.MetaKeyKeyListener.html#android.text.method.MetaKeyKeyListener.clearMetaKeyState_added(android.text.Editable, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Editable, int</code>)</b>&nbsp;in&nbsp;android.text.method.MetaKeyKeyListener
+</A></nobr><br>
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.clearTestProviderEnabled_added(java.lang.String)" class="hiddenlink" target="rightframe"><b>clearTestProviderEnabled</b>
+(<code>String</code>)</A></nobr><br>
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.clearTestProviderLocation_added(java.lang.String)" class="hiddenlink" target="rightframe"><b>clearTestProviderLocation</b>
+(<code>String</code>)</A></nobr><br>
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.clearTestProviderStatus_added(java.lang.String)" class="hiddenlink" target="rightframe"><b>clearTestProviderStatus</b>
+(<code>String</code>)</A></nobr><br>
+<nobr><A HREF="android.graphics.drawable.shapes.Shape.html#android.graphics.drawable.shapes.Shape.clone_changed()" class="hiddenlink" target="rightframe">clone
+()</A></nobr><br>
+<nobr><A HREF="android.view.Menu.html#android.view.Menu.close_added()" class="hiddenlink" target="rightframe"><b>close</b>
+()</A></nobr><br>
+<nobr><A HREF="android.app.Activity.html#android.app.Activity.closeContextMenu_added()" class="hiddenlink" target="rightframe"><b>closeContextMenu</b>
+()</A></nobr><br>
+<nobr><A HREF="android.view.animation.Animation.html#android.view.animation.Animation.computeDurationHint_added()" class="hiddenlink" target="rightframe"><b>computeDurationHint</b>
+()</A></nobr><br>
+<nobr><A HREF="android.graphics.Bitmap.html#android.graphics.Bitmap.copyPixelsFromBuffer_added(java.nio.Buffer)" class="hiddenlink" target="rightframe"><b>copyPixelsFromBuffer</b>
+(<code>Buffer</code>)</A></nobr><br>
+<nobr><A HREF="android.content.res.AssetFileDescriptor.html#android.content.res.AssetFileDescriptor.createInputStream_added()" class="hiddenlink" target="rightframe"><b>createInputStream</b>
+()</A></nobr><br>
+<nobr><A HREF="android.content.res.AssetFileDescriptor.html#android.content.res.AssetFileDescriptor.createOutputStream_added()" class="hiddenlink" target="rightframe"><b>createOutputStream</b>
+()</A></nobr><br>
+<nobr><A HREF="android.net.wifi.WifiManager.html#android.net.wifi.WifiManager.createWifiLock_added(int, java.lang.String)" class="hiddenlink" target="rightframe"><b>createWifiLock</b>
+(<code>int, String</code>)</A></nobr><br>
+<A NAME="D"></A>
+<br><font size="+2">D</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<i>describeContents</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.content.res.AssetFileDescriptor.html#android.content.res.AssetFileDescriptor.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.content.res.AssetFileDescriptor
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.graphics.RectF.html#android.graphics.RectF.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.graphics.RectF
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.Annotation.html#android.text.Annotation.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.Annotation
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.AbsoluteSizeSpan.html#android.text.style.AbsoluteSizeSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.AbsoluteSizeSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.AlignmentSpan.Standard.html#android.text.style.AlignmentSpan.Standard.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.AlignmentSpan.Standard
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.BackgroundColorSpan.html#android.text.style.BackgroundColorSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.BackgroundColorSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.BulletSpan.html#android.text.style.BulletSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.BulletSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.ForegroundColorSpan.html#android.text.style.ForegroundColorSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.ForegroundColorSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.LeadingMarginSpan.Standard.html#android.text.style.LeadingMarginSpan.Standard.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.LeadingMarginSpan.Standard
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.QuoteSpan.html#android.text.style.QuoteSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.QuoteSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.RelativeSizeSpan.html#android.text.style.RelativeSizeSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.RelativeSizeSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.ScaleXSpan.html#android.text.style.ScaleXSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.ScaleXSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.StrikethroughSpan.html#android.text.style.StrikethroughSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.StrikethroughSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.StyleSpan.html#android.text.style.StyleSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.StyleSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.SubscriptSpan.html#android.text.style.SubscriptSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.SubscriptSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.SuperscriptSpan.html#android.text.style.SuperscriptSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.SuperscriptSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.TextAppearanceSpan.html#android.text.style.TextAppearanceSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.TextAppearanceSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.TypefaceSpan.html#android.text.style.TypefaceSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.TypefaceSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.URLSpan.html#android.text.style.URLSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.URLSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.UnderlineSpan.html#android.text.style.UnderlineSpan.describeContents_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.UnderlineSpan
+</A></nobr><br>
+<nobr><A HREF="android.view.KeyCharacterMap.html#android.view.KeyCharacterMap.deviceHasKey_added(int)" class="hiddenlink" target="rightframe"><b>deviceHasKey</b>
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.view.KeyCharacterMap.html#android.view.KeyCharacterMap.deviceHasKeys_added(int[])" class="hiddenlink" target="rightframe"><b>deviceHasKeys</b>
+(<code>int[]</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.didTouchFocusSelect_added()" class="hiddenlink" target="rightframe"><b>didTouchFocusSelect</b>
+()</A></nobr><br>
+<nobr><A HREF="android.view.View.html#android.view.View.dispatchKeyEventPreIme_added(android.view.KeyEvent)" class="hiddenlink" target="rightframe"><b>dispatchKeyEventPreIme</b>
+(<code>KeyEvent</code>)</A></nobr><br>
+<i>drag</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.drag_added(android.test.InstrumentationTestCase, float, float, float, float, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>InstrumentationTestCase, float, float, float, float, int</code>)</b>&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.drag_changed(android.test.ActivityInstrumentationTestCase, float, float, float, float, int)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>ActivityInstrumentationTestCase, float, float, float, float, int</code>)&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+<i>dragQuarterScreenDown</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragQuarterScreenDown_added(android.test.InstrumentationTestCase, android.app.Activity)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>InstrumentationTestCase, Activity</code>)</b>&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragQuarterScreenDown_changed(android.test.ActivityInstrumentationTestCase)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>ActivityInstrumentationTestCase</code>)&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+<i>dragQuarterScreenUp</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragQuarterScreenUp_added(android.test.InstrumentationTestCase, android.app.Activity)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>InstrumentationTestCase, Activity</code>)</b>&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragQuarterScreenUp_changed(android.test.ActivityInstrumentationTestCase)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>ActivityInstrumentationTestCase</code>)&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+<i>dragViewBy</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewBy_added(android.test.InstrumentationTestCase, android.view.View, int, int, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>InstrumentationTestCase, View, int, int, int</code>)</b>&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewBy_changed(android.test.ActivityInstrumentationTestCase, android.view.View, int, int, int)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>ActivityInstrumentationTestCase, View, int, int, int</code>)&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+<i>dragViewTo</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewTo_added(android.test.InstrumentationTestCase, android.view.View, int, int, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>InstrumentationTestCase, View, int, int, int</code>)</b>&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewTo_changed(android.test.ActivityInstrumentationTestCase, android.view.View, int, int, int)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>ActivityInstrumentationTestCase, View, int, int, int</code>)&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+<i>dragViewToBottom</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewToBottom_added(android.test.ActivityInstrumentationTestCase, android.view.View, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>ActivityInstrumentationTestCase, View, int</code>)</b>&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewToBottom_added(android.test.InstrumentationTestCase, android.app.Activity, android.view.View, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>InstrumentationTestCase, Activity, View, int</code>)</b>&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewToBottom_changed(android.test.ActivityInstrumentationTestCase, android.view.View)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>ActivityInstrumentationTestCase, View</code>)&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewToBottom_changed(android.test.InstrumentationTestCase, android.app.Activity, android.view.View)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>InstrumentationTestCase, Activity, View</code>)&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+<i>dragViewToTop</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewToTop_added(android.test.InstrumentationTestCase, android.view.View)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>InstrumentationTestCase, View</code>)</b>&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewToTop_added(android.test.InstrumentationTestCase, android.view.View, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>InstrumentationTestCase, View, int</code>)</b>&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewToTop_changed(android.test.ActivityInstrumentationTestCase, android.view.View)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>ActivityInstrumentationTestCase, View</code>)&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewToTop_changed(android.test.ActivityInstrumentationTestCase, android.view.View, int)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>ActivityInstrumentationTestCase, View, int</code>)&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+<i>dragViewToX</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewToX_added(android.test.InstrumentationTestCase, android.view.View, int, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>InstrumentationTestCase, View, int, int</code>)</b>&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewToX_changed(android.test.ActivityInstrumentationTestCase, android.view.View, int, int)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>ActivityInstrumentationTestCase, View, int, int</code>)&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+<i>dragViewToY</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewToY_added(android.test.InstrumentationTestCase, android.view.View, int, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>InstrumentationTestCase, View, int, int</code>)</b>&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewToY_changed(android.test.ActivityInstrumentationTestCase, android.view.View, int, int)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>ActivityInstrumentationTestCase, View, int, int</code>)&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+<nobr><A HREF="android.graphics.Canvas.html#android.graphics.Canvas.drawBitmap_added(int[], int, int, float, float, int, int, boolean, android.graphics.Paint)" class="hiddenlink" target="rightframe"><b>drawBitmap</b>
+(<code>int[], int, int, float, float, int, int, boolean, Paint</code>)</A></nobr><br>
+<i>dump</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.location.Location.html#android.location.Location.dump_added(android.util.Printer, java.lang.String)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Printer, String</code>)</b>&nbsp;in&nbsp;android.location.Location
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.os.Binder.html#android.os.Binder.dump_added(java.io.FileDescriptor, java.lang.String[])" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>FileDescriptor, String[]</code>)</b>&nbsp;in&nbsp;android.os.Binder
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.os.IBinder.html#android.os.IBinder.dump_added(java.io.FileDescriptor, java.lang.String[])" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>FileDescriptor, String[]</code>)</b>&nbsp;in&nbsp;android.os.IBinder
+</A></nobr><br>
+<nobr><A HREF="android.view.ViewDebug.html#android.view.ViewDebug.dumpCapturedView_added(java.lang.String, java.lang.Object)" class="hiddenlink" target="rightframe"><b>dumpCapturedView</b>
+(<code>String, Object</code>)</A></nobr><br>
+<i>dumpHprofData</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.os.Debug.html#android.os.Debug.dumpHprofData_added(java.lang.String)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>String</code>)</b>&nbsp;in&nbsp;android.os.Debug
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="dalvik.system.VMDebug.html#dalvik.system.VMDebug.dumpHprofData_added(java.lang.String)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>String</code>)</b>&nbsp;in&nbsp;dalvik.system.VMDebug
+</A></nobr><br>
+<nobr><A HREF="android.text.TextUtils.html#android.text.TextUtils.dumpSpans_added(java.lang.CharSequence, android.util.Printer, java.lang.String)" class="hiddenlink" target="rightframe"><b>dumpSpans</b>
+(<code>CharSequence, Printer, String</code>)</A></nobr><br>
+<A NAME="E"></A>
+<br><font size="+2">E</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.endBatchEdit_added()" class="hiddenlink" target="rightframe"><b>endBatchEdit</b>
+()</A></nobr><br>
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.extractText_added(android.view.inputmethod.ExtractedTextRequest, android.view.inputmethod.ExtractedText)" class="hiddenlink" target="rightframe"><b>extractText</b>
+(<code>ExtractedTextRequest, ExtractedText</code>)</A></nobr><br>
+<A NAME="F"></A>
+<br><font size="+2">F</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.webkit.WebView.html#android.webkit.WebView.findAll_added(java.lang.String)" class="hiddenlink" target="rightframe"><b>findAll</b>
+(<code>String</code>)</A></nobr><br>
+<nobr><A HREF="android.webkit.WebView.html#android.webkit.WebView.findNext_added(boolean)" class="hiddenlink" target="rightframe"><b>findNext</b>
+(<code>boolean</code>)</A></nobr><br>
+<i>forkAndSpecialize</i><br>
+&nbsp;&nbsp;<nobr><A HREF="dalvik.system.Zygote.html#dalvik.system.Zygote.forkAndSpecialize_added(int, int, int[], int, int[][])" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>int, int, int[], int, int[][]</code>)</b>&nbsp;in&nbsp;dalvik.system.Zygote
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="dalvik.system.Zygote.html#dalvik.system.Zygote.forkAndSpecialize_changed(int, int, int[], boolean, int[][])" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>int, int, int[], boolean, int[][]</code>)&nbsp;in&nbsp;dalvik.system.Zygote
+</A></nobr><br>
+<i>forkSystemServer</i><br>
+&nbsp;&nbsp;<nobr><A HREF="dalvik.system.Zygote.html#dalvik.system.Zygote.forkSystemServer_added(int, int, int[], int, int[][])" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>int, int, int[], int, int[][]</code>)</b>&nbsp;in&nbsp;dalvik.system.Zygote
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="dalvik.system.Zygote.html#dalvik.system.Zygote.forkSystemServer_changed(int, int, int[], boolean, int[][])" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>int, int, int[], boolean, int[][]</code>)&nbsp;in&nbsp;dalvik.system.Zygote
+</A></nobr><br>
+<nobr><A HREF="android.telephony.PhoneNumberUtils.html#android.telephony.PhoneNumberUtils.formatJapaneseNumber_added(android.text.Editable)" class="hiddenlink" target="rightframe"><b>formatJapaneseNumber</b>
+(<code>Editable</code>)</A></nobr><br>
+<nobr><A HREF="java.lang.Character.UnicodeBlock.html#java.lang.Character.UnicodeBlock.forName_changed(java.lang.String)" class="hiddenlink" target="rightframe">forName
+(<code>String</code>)</A></nobr><br>
+<A NAME="G"></A>
+<br><font size="+2">G</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.get_added(android.content.Context)" class="hiddenlink" target="rightframe"><b>get</b>
+(<code>Context</code>)</A></nobr><br>
+<nobr><A HREF="android.webkit.WebSettings.html#android.webkit.WebSettings.getAllowFileAccess_added()" class="hiddenlink" target="rightframe"><b>getAllowFileAccess</b>
+()</A></nobr><br>
+<nobr><A HREF="android.net.ConnectivityManager.html#android.net.ConnectivityManager.getBackgroundDataSetting_added()" class="hiddenlink" target="rightframe"><b>getBackgroundDataSetting</b>
+()</A></nobr><br>
+<nobr><A HREF="android.content.res.Resources.html#android.content.res.Resources.getBoolean_added(int)" class="hiddenlink" target="rightframe"><b>getBoolean</b>
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.webkit.WebSettings.html#android.webkit.WebSettings.getBuiltInZoomControls_added()" class="hiddenlink" target="rightframe"><b>getBuiltInZoomControls</b>
+()</A></nobr><br>
+<nobr><A HREF="android.app.AlertDialog.html#android.app.AlertDialog.getButton_added(int)" class="hiddenlink" target="rightframe"><b>getButton</b>
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.text.TextUtils.html#android.text.TextUtils.getCapsMode_added(java.lang.CharSequence, int, int)" class="hiddenlink" target="rightframe"><b>getCapsMode</b>
+(<code>CharSequence, int, int</code>)</A></nobr><br>
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.getCharacters_added()" class="hiddenlink" target="rightframe"><b>getCharacters</b>
+()</A></nobr><br>
+<nobr><A HREF="java.lang.Class.html#java.lang.Class.getClasses_changed()" class="hiddenlink" target="rightframe">getClasses
+()</A></nobr><br>
+<i>getColumnIndex</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.database.Cursor.html#android.database.Cursor.getColumnIndex_changed(java.lang.String)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>String</code>)&nbsp;in&nbsp;android.database.Cursor
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.database.CursorWrapper.html#android.database.CursorWrapper.getColumnIndex_changed(java.lang.String)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>String</code>)&nbsp;in&nbsp;android.database.CursorWrapper
+</A></nobr><br>
+<nobr><A HREF="java.lang.Class.html#java.lang.Class.getConstructors_changed()" class="hiddenlink" target="rightframe">getConstructors
+()</A></nobr><br>
+<nobr><A HREF="android.widget.CursorAdapter.html#android.widget.CursorAdapter.getCount_changed()" class="hiddenlink" target="rightframe">getCount
+()</A></nobr><br>
+<nobr><A HREF="java.lang.Class.html#java.lang.Class.getDeclaredClasses_changed()" class="hiddenlink" target="rightframe">getDeclaredClasses
+()</A></nobr><br>
+<nobr><A HREF="java.lang.Class.html#java.lang.Class.getDeclaredConstructors_changed()" class="hiddenlink" target="rightframe">getDeclaredConstructors
+()</A></nobr><br>
+<nobr><A HREF="android.content.res.AssetFileDescriptor.html#android.content.res.AssetFileDescriptor.getDeclaredLength_added()" class="hiddenlink" target="rightframe"><b>getDeclaredLength</b>
+()</A></nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.getDefaultSensor_added(int)" class="hiddenlink" target="rightframe"><b>getDefaultSensor</b>
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.app.ActivityManager.html#android.app.ActivityManager.getDeviceConfigurationInfo_added()" class="hiddenlink" target="rightframe"><b>getDeviceConfigurationInfo</b>
+()</A></nobr><br>
+<nobr><A HREF="android.preference.DialogPreference.html#android.preference.DialogPreference.getDialog_added()" class="hiddenlink" target="rightframe"><b>getDialog</b>
+()</A></nobr><br>
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getDoubleTapTimeout_added()" class="hiddenlink" target="rightframe"><b>getDoubleTapTimeout</b>
+()</A></nobr><br>
+<i>getDrawable</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.graphics.drawable.RotateDrawable.html#android.graphics.drawable.RotateDrawable.getDrawable_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.graphics.drawable.RotateDrawable
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.graphics.drawable.ScaleDrawable.html#android.graphics.drawable.ScaleDrawable.getDrawable_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.graphics.drawable.ScaleDrawable
+</A></nobr><br>
+<nobr><A HREF="android.widget.AutoCompleteTextView.html#android.widget.AutoCompleteTextView.getDropDownAnchor_added()" class="hiddenlink" target="rightframe"><b>getDropDownAnchor</b>
+()</A></nobr><br>
+<nobr><A HREF="android.widget.AutoCompleteTextView.html#android.widget.AutoCompleteTextView.getDropDownWidth_added()" class="hiddenlink" target="rightframe"><b>getDropDownWidth</b>
+()</A></nobr><br>
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getEdgeSlop_changed()" class="hiddenlink" target="rightframe">getEdgeSlop
+()</A></nobr><br>
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.getEditableText_added()" class="hiddenlink" target="rightframe"><b>getEditableText</b>
+()</A></nobr><br>
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getFadingEdgeLength_changed()" class="hiddenlink" target="rightframe">getFadingEdgeLength
+()</A></nobr><br>
+<nobr><A HREF="android.content.res.Resources.html#android.content.res.Resources.getFraction_added(int, int, int)" class="hiddenlink" target="rightframe"><b>getFraction</b>
+(<code>int, int, int</code>)</A></nobr><br>
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.getGpsStatus_added(android.location.GpsStatus)" class="hiddenlink" target="rightframe"><b>getGpsStatus</b>
+(<code>GpsStatus</code>)</A></nobr><br>
+<nobr><A HREF="android.view.View.html#android.view.View.getHandler_changed()" class="hiddenlink" target="rightframe">getHandler
+()</A></nobr><br>
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.getImeActionId_added()" class="hiddenlink" target="rightframe"><b>getImeActionId</b>
+()</A></nobr><br>
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.getImeActionLabel_added()" class="hiddenlink" target="rightframe"><b>getImeActionLabel</b>
+()</A></nobr><br>
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.getImeOptions_added()" class="hiddenlink" target="rightframe"><b>getImeOptions</b>
+()</A></nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.getInclination_added(float[])" class="hiddenlink" target="rightframe"><b>getInclination</b>
+(<code>float[]</code>)</A></nobr><br>
+<nobr><A HREF="android.text.method.Touch.html#android.text.method.Touch.getInitialScrollX_added(android.widget.TextView, android.text.Spannable)" class="hiddenlink" target="rightframe"><b>getInitialScrollX</b>
+(<code>TextView, Spannable</code>)</A></nobr><br>
+<nobr><A HREF="android.text.method.Touch.html#android.text.method.Touch.getInitialScrollY_added(android.widget.TextView, android.text.Spannable)" class="hiddenlink" target="rightframe"><b>getInitialScrollY</b>
+(<code>TextView, Spannable</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.getInputExtras_added(boolean)" class="hiddenlink" target="rightframe"><b>getInputExtras</b>
+(<code>boolean</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.getInputMethodMode_added()" class="hiddenlink" target="rightframe"><b>getInputMethodMode</b>
+()</A></nobr><br>
+<i>getInputType</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.DateKeyListener.html#android.text.method.DateKeyListener.getInputType_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.method.DateKeyListener
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.DateTimeKeyListener.html#android.text.method.DateTimeKeyListener.getInputType_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.method.DateTimeKeyListener
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.DialerKeyListener.html#android.text.method.DialerKeyListener.getInputType_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.method.DialerKeyListener
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.DigitsKeyListener.html#android.text.method.DigitsKeyListener.getInputType_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.method.DigitsKeyListener
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.KeyListener.html#android.text.method.KeyListener.getInputType_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.method.KeyListener
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.MultiTapKeyListener.html#android.text.method.MultiTapKeyListener.getInputType_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.method.MultiTapKeyListener
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.QwertyKeyListener.html#android.text.method.QwertyKeyListener.getInputType_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.method.QwertyKeyListener
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.TextKeyListener.html#android.text.method.TextKeyListener.getInputType_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.method.TextKeyListener
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.TimeKeyListener.html#android.text.method.TimeKeyListener.getInputType_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.method.TimeKeyListener
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.getInputType_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.widget.TextView
+</A></nobr><br>
+<nobr><A HREF="java.lang.Class.html#java.lang.Class.getInterfaces_changed()" class="hiddenlink" target="rightframe">getInterfaces
+()</A></nobr><br>
+<i>getItem</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.view.Menu.html#android.view.Menu.getItem_added(int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>int</code>)</b>&nbsp;in&nbsp;android.view.Menu
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.widget.CursorAdapter.html#android.widget.CursorAdapter.getItem_changed(int)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>int</code>)&nbsp;in&nbsp;android.widget.CursorAdapter
+</A></nobr><br>
+<nobr><A HREF="android.widget.AutoCompleteTextView.html#android.widget.AutoCompleteTextView.getItemClickListener_changed()" class="hiddenlink" target="rightframe">getItemClickListener
+()</A></nobr><br>
+<nobr><A HREF="android.widget.CursorAdapter.html#android.widget.CursorAdapter.getItemId_changed(int)" class="hiddenlink" target="rightframe">getItemId
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.AutoCompleteTextView.html#android.widget.AutoCompleteTextView.getItemSelectedListener_changed()" class="hiddenlink" target="rightframe">getItemSelectedListener
+()</A></nobr><br>
+<nobr><A HREF="android.widget.AbsSeekBar.html#android.widget.AbsSeekBar.getKeyProgressIncrement_added()" class="hiddenlink" target="rightframe"><b>getKeyProgressIncrement</b>
+()</A></nobr><br>
+<i>getLaunchIntentForPackage</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.content.pm.PackageManager.html#android.content.pm.PackageManager.getLaunchIntentForPackage_added(java.lang.String)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>String</code>)</b>&nbsp;in&nbsp;android.content.pm.PackageManager
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.mock.MockPackageManager.html#android.test.mock.MockPackageManager.getLaunchIntentForPackage_added(java.lang.String)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>String</code>)</b>&nbsp;in&nbsp;android.test.mock.MockPackageManager
+</A></nobr><br>
+<nobr><A HREF="android.content.res.TypedArray.html#android.content.res.TypedArray.getLayoutDimension_added(int, int)" class="hiddenlink" target="rightframe"><b>getLayoutDimension</b>
+(<code>int, int</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.AutoCompleteTextView.html#android.widget.AutoCompleteTextView.getListSelection_added()" class="hiddenlink" target="rightframe"><b>getListSelection</b>
+()</A></nobr><br>
+<nobr><A HREF="android.app.AlertDialog.html#android.app.AlertDialog.getListView_added()" class="hiddenlink" target="rightframe"><b>getListView</b>
+()</A></nobr><br>
+<nobr><A HREF="java.util.logging.LogManager.html#java.util.logging.LogManager.getLoggingMXBean_added()" class="hiddenlink" target="rightframe"><b>getLoggingMXBean</b>
+()</A></nobr><br>
+<i>getLong</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.getLong_added(android.content.ContentResolver, java.lang.String)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>ContentResolver, String</code>)</b>&nbsp;in&nbsp;android.provider.Settings.System
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.getLong_added(android.content.ContentResolver, java.lang.String, long)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>ContentResolver, String, long</code>)</b>&nbsp;in&nbsp;android.provider.Settings.System
+</A></nobr><br>
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.getMaxAvailableHeight_added(android.view.View, int)" class="hiddenlink" target="rightframe"><b>getMaxAvailableHeight</b>
+(<code>View, int</code>)</A></nobr><br>
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getMaximumDrawingCacheSize_changed()" class="hiddenlink" target="rightframe">getMaximumDrawingCacheSize
+()</A></nobr><br>
+<nobr><A HREF="android.view.KeyEvent.html#android.view.KeyEvent.getMaxKeyCode_added()" class="hiddenlink" target="rightframe"><b>getMaxKeyCode</b>
+()</A></nobr><br>
+<i>getMetaState</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.MetaKeyKeyListener.html#android.text.method.MetaKeyKeyListener.getMetaState_added(long)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>long</code>)</b>&nbsp;in&nbsp;android.text.method.MetaKeyKeyListener
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.MetaKeyKeyListener.html#android.text.method.MetaKeyKeyListener.getMetaState_added(long, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>long, int</code>)</b>&nbsp;in&nbsp;android.text.method.MetaKeyKeyListener
+</A></nobr><br>
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getMinimumFlingVelocity_changed()" class="hiddenlink" target="rightframe">getMinimumFlingVelocity
+()</A></nobr><br>
+<nobr><A HREF="android.telephony.TelephonyManager.html#android.telephony.TelephonyManager.getNeighboringCellInfo_added()" class="hiddenlink" target="rightframe"><b>getNeighboringCellInfo</b>
+()</A></nobr><br>
+<nobr><A HREF="android.widget.Chronometer.html#android.widget.Chronometer.getOnChronometerTickListener_added()" class="hiddenlink" target="rightframe"><b>getOnChronometerTickListener</b>
+()</A></nobr><br>
+<nobr><A HREF="android.widget.AutoCompleteTextView.html#android.widget.AutoCompleteTextView.getOnItemClickListener_added()" class="hiddenlink" target="rightframe"><b>getOnItemClickListener</b>
+()</A></nobr><br>
+<nobr><A HREF="android.widget.AutoCompleteTextView.html#android.widget.AutoCompleteTextView.getOnItemSelectedListener_added()" class="hiddenlink" target="rightframe"><b>getOnItemSelectedListener</b>
+()</A></nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.getOrientation_added(float[], float[])" class="hiddenlink" target="rightframe"><b>getOrientation</b>
+(<code>float[], float[]</code>)</A></nobr><br>
+<i>getOriginalUrl</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.webkit.WebHistoryItem.html#android.webkit.WebHistoryItem.getOriginalUrl_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.webkit.WebHistoryItem
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.webkit.WebView.html#android.webkit.WebView.getOriginalUrl_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.webkit.WebView
+</A></nobr><br>
+<i>getPluginData</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.webkit.UrlInterceptHandler.html#android.webkit.UrlInterceptHandler.getPluginData_added(java.lang.String, java.util.Map<java.lang.String, java.lang.String>)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>String, Map&lt;String, String&gt;</code>)</b>&nbsp;in&nbsp;android.webkit.UrlInterceptHandler
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.webkit.UrlInterceptRegistry.html#android.webkit.UrlInterceptRegistry.getPluginData_added(java.lang.String, java.util.Map<java.lang.String, java.lang.String>)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>String, Map&lt;String, String&gt;</code>)</b>&nbsp;in&nbsp;android.webkit.UrlInterceptRegistry
+</A></nobr><br>
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.getPrivateImeOptions_added()" class="hiddenlink" target="rightframe"><b>getPrivateImeOptions</b>
+()</A></nobr><br>
+<nobr><A HREF="java.lang.reflect.Proxy.html#java.lang.reflect.Proxy.getProxyClass_changed(java.lang.ClassLoader, java.lang.Class<?>...)" class="hiddenlink" target="rightframe">getProxyClass
+(<code>ClassLoader, Class&lt;?&gt;</code>)</A></nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.getRotationMatrix_added(float[], float[], float[], float[])" class="hiddenlink" target="rightframe"><b>getRotationMatrix</b>
+(<code>float[], float[], float[], float[]</code>)</A></nobr><br>
+<nobr><A HREF="android.app.ActivityManager.html#android.app.ActivityManager.getRunningAppProcesses_added()" class="hiddenlink" target="rightframe"><b>getRunningAppProcesses</b>
+()</A></nobr><br>
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getScaledDoubleTapSlop_added()" class="hiddenlink" target="rightframe"><b>getScaledDoubleTapSlop</b>
+()</A></nobr><br>
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getScaledEdgeSlop_added()" class="hiddenlink" target="rightframe"><b>getScaledEdgeSlop</b>
+()</A></nobr><br>
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getScaledFadingEdgeLength_added()" class="hiddenlink" target="rightframe"><b>getScaledFadingEdgeLength</b>
+()</A></nobr><br>
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getScaledMaximumDrawingCacheSize_added()" class="hiddenlink" target="rightframe"><b>getScaledMaximumDrawingCacheSize</b>
+()</A></nobr><br>
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getScaledMinimumFlingVelocity_added()" class="hiddenlink" target="rightframe"><b>getScaledMinimumFlingVelocity</b>
+()</A></nobr><br>
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getScaledScrollBarSize_added()" class="hiddenlink" target="rightframe"><b>getScaledScrollBarSize</b>
+()</A></nobr><br>
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getScaledTouchSlop_added()" class="hiddenlink" target="rightframe"><b>getScaledTouchSlop</b>
+()</A></nobr><br>
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getScaledWindowTouchSlop_added()" class="hiddenlink" target="rightframe"><b>getScaledWindowTouchSlop</b>
+()</A></nobr><br>
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getScrollBarSize_changed()" class="hiddenlink" target="rightframe">getScrollBarSize
+()</A></nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.getSensorList_added(int)" class="hiddenlink" target="rightframe"><b>getSensorList</b>
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.getSensors_changed()" class="hiddenlink" target="rightframe">getSensors
+()</A></nobr><br>
+<nobr><A HREF="android.text.AutoText.html#android.text.AutoText.getSize_added(android.view.View)" class="hiddenlink" target="rightframe"><b>getSize</b>
+(<code>View</code>)</A></nobr><br>
+<i>getSpanTypeId</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.Annotation.html#android.text.Annotation.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.Annotation
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.AbsoluteSizeSpan.html#android.text.style.AbsoluteSizeSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.AbsoluteSizeSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.AlignmentSpan.Standard.html#android.text.style.AlignmentSpan.Standard.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.AlignmentSpan.Standard
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.BackgroundColorSpan.html#android.text.style.BackgroundColorSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.BackgroundColorSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.BulletSpan.html#android.text.style.BulletSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.BulletSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.ForegroundColorSpan.html#android.text.style.ForegroundColorSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.ForegroundColorSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.LeadingMarginSpan.Standard.html#android.text.style.LeadingMarginSpan.Standard.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.LeadingMarginSpan.Standard
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.QuoteSpan.html#android.text.style.QuoteSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.QuoteSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.RelativeSizeSpan.html#android.text.style.RelativeSizeSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.RelativeSizeSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.ScaleXSpan.html#android.text.style.ScaleXSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.ScaleXSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.StrikethroughSpan.html#android.text.style.StrikethroughSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.StrikethroughSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.StyleSpan.html#android.text.style.StyleSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.StyleSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.SubscriptSpan.html#android.text.style.SubscriptSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.SubscriptSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.SuperscriptSpan.html#android.text.style.SuperscriptSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.SuperscriptSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.TextAppearanceSpan.html#android.text.style.TextAppearanceSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.TextAppearanceSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.TypefaceSpan.html#android.text.style.TypefaceSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.TypefaceSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.URLSpan.html#android.text.style.URLSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.URLSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.UnderlineSpan.html#android.text.style.UnderlineSpan.getSpanTypeId_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.text.style.UnderlineSpan
+</A></nobr><br>
+<nobr><A HREF="android.widget.Scroller.html#android.widget.Scroller.getStartX_added()" class="hiddenlink" target="rightframe"><b>getStartX</b>
+()</A></nobr><br>
+<nobr><A HREF="android.widget.Scroller.html#android.widget.Scroller.getStartY_added()" class="hiddenlink" target="rightframe"><b>getStartY</b>
+()</A></nobr><br>
+<nobr><A HREF="android.os.ParcelFileDescriptor.html#android.os.ParcelFileDescriptor.getStatSize_added()" class="hiddenlink" target="rightframe"><b>getStatSize</b>
+()</A></nobr><br>
+<nobr><A HREF="android.net.NetworkInfo.html#android.net.NetworkInfo.getSubtype_added()" class="hiddenlink" target="rightframe"><b>getSubtype</b>
+()</A></nobr><br>
+<nobr><A HREF="android.net.NetworkInfo.html#android.net.NetworkInfo.getSubtypeName_added()" class="hiddenlink" target="rightframe"><b>getSubtypeName</b>
+()</A></nobr><br>
+<nobr><A HREF="android.webkit.UrlInterceptRegistry.html#android.webkit.UrlInterceptRegistry.getSurrogate_changed(java.lang.String, java.util.Map<java.lang.String, java.lang.String>)" class="hiddenlink" target="rightframe">getSurrogate
+(<code>String, Map&lt;String, String&gt;</code>)</A></nobr><br>
+<i>getSystemSharedLibraryNames</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.content.pm.PackageManager.html#android.content.pm.PackageManager.getSystemSharedLibraryNames_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.content.pm.PackageManager
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.mock.MockPackageManager.html#android.test.mock.MockPackageManager.getSystemSharedLibraryNames_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.test.mock.MockPackageManager
+</A></nobr><br>
+<nobr><A HREF="android.app.LauncherActivity.html#android.app.LauncherActivity.getTargetIntent_changed()" class="hiddenlink" target="rightframe">getTargetIntent
+()</A></nobr><br>
+<nobr><A HREF="android.widget.AbsListView.html#android.widget.AbsListView.getTextFilter_added()" class="hiddenlink" target="rightframe"><b>getTextFilter</b>
+()</A></nobr><br>
+<nobr><A HREF="android.os.Looper.html#android.os.Looper.getThread_added()" class="hiddenlink" target="rightframe"><b>getThread</b>
+()</A></nobr><br>
+<nobr><A HREF="android.util.TimeUtils.html#android.util.TimeUtils.getTimeZoneDatabaseVersion_added()" class="hiddenlink" target="rightframe"><b>getTimeZoneDatabaseVersion</b>
+()</A></nobr><br>
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getTouchSlop_changed()" class="hiddenlink" target="rightframe">getTouchSlop
+()</A></nobr><br>
+<nobr><A HREF="android.webkit.WebSettings.html#android.webkit.WebSettings.getUserAgent_changed()" class="hiddenlink" target="rightframe">getUserAgent
+()</A></nobr><br>
+<nobr><A HREF="android.webkit.WebSettings.html#android.webkit.WebSettings.getUserAgentString_added()" class="hiddenlink" target="rightframe"><b>getUserAgentString</b>
+()</A></nobr><br>
+<nobr><A HREF="android.text.style.DynamicDrawableSpan.html#android.text.style.DynamicDrawableSpan.getVerticalAlignment_added()" class="hiddenlink" target="rightframe"><b>getVerticalAlignment</b>
+()</A></nobr><br>
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getWindowTouchSlop_changed()" class="hiddenlink" target="rightframe">getWindowTouchSlop
+()</A></nobr><br>
+<nobr><A HREF="android.view.View.html#android.view.View.getWindowVisibleDisplayFrame_added(android.graphics.Rect)" class="hiddenlink" target="rightframe"><b>getWindowVisibleDisplayFrame</b>
+(<code>Rect</code>)</A></nobr><br>
+<nobr><A HREF="android.webkit.WebView.html#android.webkit.WebView.getZoomControls_changed()" class="hiddenlink" target="rightframe">getZoomControls
+()</A></nobr><br>
+<A NAME="H"></A>
+<br><font size="+2">H</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.text.method.MetaKeyKeyListener.html#android.text.method.MetaKeyKeyListener.handleKeyDown_added(long, int, android.view.KeyEvent)" class="hiddenlink" target="rightframe"><b>handleKeyDown</b>
+(<code>long, int, KeyEvent</code>)</A></nobr><br>
+<nobr><A HREF="android.text.method.MetaKeyKeyListener.html#android.text.method.MetaKeyKeyListener.handleKeyUp_added(long, int, android.view.KeyEvent)" class="hiddenlink" target="rightframe"><b>handleKeyUp</b>
+(<code>long, int, KeyEvent</code>)</A></nobr><br>
+<nobr><A HREF="android.view.Window.html#android.view.Window.hasSoftInputMode_added()" class="hiddenlink" target="rightframe"><b>hasSoftInputMode</b>
+()</A></nobr><br>
+<nobr><A HREF="android.app.Activity.html#android.app.Activity.hasWindowFocus_added()" class="hiddenlink" target="rightframe"><b>hasWindowFocus</b>
+()</A></nobr><br>
+<A NAME="I"></A>
+<br><font size="+2">I</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.media.RingtoneManager.html#android.media.RingtoneManager.inferStreamType_added()" class="hiddenlink" target="rightframe"><b>inferStreamType</b>
+()</A></nobr><br>
+<nobr><A HREF="android.app.LauncherActivity.html#android.app.LauncherActivity.intentForPosition_added(int)" class="hiddenlink" target="rightframe"><b>intentForPosition</b>
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.isAboveAnchor_added()" class="hiddenlink" target="rightframe"><b>isAboveAnchor</b>
+()</A></nobr><br>
+<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.isBluetoothA2dpOn_added()" class="hiddenlink" target="rightframe"><b>isBluetoothA2dpOn</b>
+()</A></nobr><br>
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.isClippingEnabled_added()" class="hiddenlink" target="rightframe"><b>isClippingEnabled</b>
+()</A></nobr><br>
+<nobr><A HREF="android.webkit.URLUtil.html#android.webkit.URLUtil.isCookielessProxyUrl_changed(java.lang.String)" class="hiddenlink" target="rightframe">isCookielessProxyUrl
+(<code>String</code>)</A></nobr><br>
+<nobr><A HREF="dalvik.system.VMDebug.html#dalvik.system.VMDebug.isDebuggingEnabled_added()" class="hiddenlink" target="rightframe"><b>isDebuggingEnabled</b>
+()</A></nobr><br>
+<nobr><A HREF="android.widget.AbsListView.html#android.widget.AbsListView.isFastScrollEnabled_added()" class="hiddenlink" target="rightframe"><b>isFastScrollEnabled</b>
+()</A></nobr><br>
+<nobr><A HREF="android.view.animation.Animation.html#android.view.animation.Animation.isFillEnabled_added()" class="hiddenlink" target="rightframe"><b>isFillEnabled</b>
+()</A></nobr><br>
+<nobr><A HREF="android.view.View.html#android.view.View.isHapticFeedbackEnabled_added()" class="hiddenlink" target="rightframe"><b>isHapticFeedbackEnabled</b>
+()</A></nobr><br>
+<nobr><A HREF="android.view.View.html#android.view.View.isInEditMode_added()" class="hiddenlink" target="rightframe"><b>isInEditMode</b>
+()</A></nobr><br>
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.isInputMethodTarget_added()" class="hiddenlink" target="rightframe"><b>isInputMethodTarget</b>
+()</A></nobr><br>
+<nobr><A HREF="android.media.MediaPlayer.html#android.media.MediaPlayer.isLooping_added()" class="hiddenlink" target="rightframe"><b>isLooping</b>
+()</A></nobr><br>
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.isOutsideTouchable_added()" class="hiddenlink" target="rightframe"><b>isOutsideTouchable</b>
+()</A></nobr><br>
+<nobr><A HREF="android.widget.AutoCompleteTextView.html#android.widget.AutoCompleteTextView.isPerformingCompletion_added()" class="hiddenlink" target="rightframe"><b>isPerformingCompletion</b>
+()</A></nobr><br>
+<nobr><A HREF="android.net.NetworkInfo.html#android.net.NetworkInfo.isRoaming_added()" class="hiddenlink" target="rightframe"><b>isRoaming</b>
+()</A></nobr><br>
+<i>isSafeMode</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.content.pm.PackageManager.html#android.content.pm.PackageManager.isSafeMode_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.content.pm.PackageManager
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.mock.MockPackageManager.html#android.test.mock.MockPackageManager.isSafeMode_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.test.mock.MockPackageManager
+</A></nobr><br>
+<nobr><A HREF="android.text.method.MetaKeyKeyListener.html#android.text.method.MetaKeyKeyListener.isSelectingMetaTracker_added(java.lang.CharSequence, java.lang.Object)" class="hiddenlink" target="rightframe"><b>isSelectingMetaTracker</b>
+(<code>CharSequence, Object</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.AbsListView.html#android.widget.AbsListView.isSmoothScrollbarEnabled_added()" class="hiddenlink" target="rightframe"><b>isSmoothScrollbarEnabled</b>
+()</A></nobr><br>
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.isTouchable_added()" class="hiddenlink" target="rightframe"><b>isTouchable</b>
+()</A></nobr><br>
+<A NAME="L"></A>
+<br><font size="+2">L</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.test.InstrumentationTestCase.html#android.test.InstrumentationTestCase.launchActivityWithIntent_added(java.lang.String, java.lang.Class<T>, android.content.Intent)" class="hiddenlink" target="rightframe"><b>launchActivityWithIntent</b>
+(<code>String, Class&lt;T&gt;, Intent</code>)</A></nobr><br>
+<i>load</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.media.SoundPool.html#android.media.SoundPool.load_added(android.content.res.AssetFileDescriptor, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>AssetFileDescriptor, int</code>)</b>&nbsp;in&nbsp;android.media.SoundPool
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.media.SoundPool.html#android.media.SoundPool.load_added(java.io.FileDescriptor, long, long, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>FileDescriptor, long, long, int</code>)</b>&nbsp;in&nbsp;android.media.SoundPool
+</A></nobr><br>
+<nobr><A HREF="dalvik.system.DexFile.html#dalvik.system.DexFile.loadDex_added(java.lang.String, java.lang.String, int)" class="hiddenlink" target="rightframe"><b>loadDex</b>
+(<code>String, String, int</code>)</A></nobr><br>
+<i>longClickView</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.longClickView_added(android.test.InstrumentationTestCase, android.view.View)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>InstrumentationTestCase, View</code>)</b>&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.longClickView_changed(android.test.ActivityInstrumentationTestCase, android.view.View)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>ActivityInstrumentationTestCase, View</code>)&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+<A NAME="M"></A>
+<br><font size="+2">M</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.app.LauncherActivity.html#android.app.LauncherActivity.makeListItems_added()" class="hiddenlink" target="rightframe"><b>makeListItems</b>
+()</A></nobr><br>
+<nobr><A HREF="android.view.WindowManager.LayoutParams.html#android.view.WindowManager.LayoutParams.mayUseInputMethod_added(int)" class="hiddenlink" target="rightframe"><b>mayUseInputMethod</b>
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.moveCursorToVisibleOffset_added()" class="hiddenlink" target="rightframe"><b>moveCursorToVisibleOffset</b>
+()</A></nobr><br>
+<nobr><A HREF="android.graphics.drawable.Drawable.html#android.graphics.drawable.Drawable.mutate_added()" class="hiddenlink" target="rightframe"><b>mutate</b>
+()</A></nobr><br>
+<A NAME="O"></A>
+<br><font size="+2">O</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.onBeginBatchEdit_added()" class="hiddenlink" target="rightframe"><b>onBeginBatchEdit</b>
+()</A></nobr><br>
+<nobr><A HREF="android.view.View.html#android.view.View.onCheckIsTextEditor_added()" class="hiddenlink" target="rightframe"><b>onCheckIsTextEditor</b>
+()</A></nobr><br>
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.onCommitCompletion_added(android.view.inputmethod.CompletionInfo)" class="hiddenlink" target="rightframe"><b>onCommitCompletion</b>
+(<code>CompletionInfo</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.CursorAdapter.html#android.widget.CursorAdapter.onContentChanged_added()" class="hiddenlink" target="rightframe"><b>onContentChanged</b>
+()</A></nobr><br>
+<nobr><A HREF="android.view.View.html#android.view.View.onCreateInputConnection_added(android.view.inputmethod.EditorInfo)" class="hiddenlink" target="rightframe"><b>onCreateInputConnection</b>
+(<code>EditorInfo</code>)</A></nobr><br>
+<nobr><A HREF="android.view.GestureDetector.SimpleOnGestureListener.html#android.view.GestureDetector.SimpleOnGestureListener.onDoubleTap_added(android.view.MotionEvent)" class="hiddenlink" target="rightframe"><b>onDoubleTap</b>
+(<code>MotionEvent</code>)</A></nobr><br>
+<nobr><A HREF="android.view.GestureDetector.SimpleOnGestureListener.html#android.view.GestureDetector.SimpleOnGestureListener.onDoubleTapEvent_added(android.view.MotionEvent)" class="hiddenlink" target="rightframe"><b>onDoubleTapEvent</b>
+(<code>MotionEvent</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.onEditorAction_added(int)" class="hiddenlink" target="rightframe"><b>onEditorAction</b>
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.onEndBatchEdit_added()" class="hiddenlink" target="rightframe"><b>onEndBatchEdit</b>
+()</A></nobr><br>
+<nobr><A HREF="android.view.View.html#android.view.View.onFinishTemporaryDetach_added()" class="hiddenlink" target="rightframe"><b>onFinishTemporaryDetach</b>
+()</A></nobr><br>
+<nobr><A HREF="android.webkit.WebView.html#android.webkit.WebView.onGlobalFocusChanged_changed(android.view.View, android.view.View)" class="hiddenlink" target="rightframe">onGlobalFocusChanged
+(<code>View, View</code>)</A></nobr><br>
+<i>onKeyOther</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.ArrowKeyMovementMethod.html#android.text.method.ArrowKeyMovementMethod.onKeyOther_added(android.widget.TextView, android.text.Spannable, android.view.KeyEvent)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>TextView, Spannable, KeyEvent</code>)</b>&nbsp;in&nbsp;android.text.method.ArrowKeyMovementMethod
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.BaseKeyListener.html#android.text.method.BaseKeyListener.onKeyOther_added(android.view.View, android.text.Editable, android.view.KeyEvent)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>View, Editable, KeyEvent</code>)</b>&nbsp;in&nbsp;android.text.method.BaseKeyListener
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.KeyListener.html#android.text.method.KeyListener.onKeyOther_added(android.view.View, android.text.Editable, android.view.KeyEvent)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>View, Editable, KeyEvent</code>)</b>&nbsp;in&nbsp;android.text.method.KeyListener
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.MovementMethod.html#android.text.method.MovementMethod.onKeyOther_added(android.widget.TextView, android.text.Spannable, android.view.KeyEvent)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>TextView, Spannable, KeyEvent</code>)</b>&nbsp;in&nbsp;android.text.method.MovementMethod
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.method.ScrollingMovementMethod.html#android.text.method.ScrollingMovementMethod.onKeyOther_added(android.widget.TextView, android.text.Spannable, android.view.KeyEvent)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>TextView, Spannable, KeyEvent</code>)</b>&nbsp;in&nbsp;android.text.method.ScrollingMovementMethod
+</A></nobr><br>
+<nobr><A HREF="android.view.View.html#android.view.View.onKeyPreIme_added(int, android.view.KeyEvent)" class="hiddenlink" target="rightframe"><b>onKeyPreIme</b>
+(<code>int, KeyEvent</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.onPrivateIMECommand_added(java.lang.String, android.os.Bundle)" class="hiddenlink" target="rightframe"><b>onPrivateIMECommand</b>
+(<code>String, Bundle</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.ProgressBar.html#android.widget.ProgressBar.onRestoreInstanceState_changed(android.os.Parcelable)" class="hiddenlink" target="rightframe">onRestoreInstanceState
+(<code>Parcelable</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.ProgressBar.html#android.widget.ProgressBar.onSaveInstanceState_changed()" class="hiddenlink" target="rightframe">onSaveInstanceState
+()</A></nobr><br>
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.onSelectionChanged_added(int, int)" class="hiddenlink" target="rightframe"><b>onSelectionChanged</b>
+(<code>int, int</code>)</A></nobr><br>
+<nobr><A HREF="android.view.GestureDetector.SimpleOnGestureListener.html#android.view.GestureDetector.SimpleOnGestureListener.onSingleTapConfirmed_added(android.view.MotionEvent)" class="hiddenlink" target="rightframe"><b>onSingleTapConfirmed</b>
+(<code>MotionEvent</code>)</A></nobr><br>
+<nobr><A HREF="android.view.View.html#android.view.View.onStartTemporaryDetach_added()" class="hiddenlink" target="rightframe"><b>onStartTemporaryDetach</b>
+()</A></nobr><br>
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.onTextContextMenuItem_added(int)" class="hiddenlink" target="rightframe"><b>onTextContextMenuItem</b>
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.app.Activity.html#android.app.Activity.onUserInteraction_added()" class="hiddenlink" target="rightframe"><b>onUserInteraction</b>
+()</A></nobr><br>
+<nobr><A HREF="android.app.Activity.html#android.app.Activity.onUserLeaveHint_added()" class="hiddenlink" target="rightframe"><b>onUserLeaveHint</b>
+()</A></nobr><br>
+<nobr><A HREF="android.content.ContentProvider.html#android.content.ContentProvider.openAssetFile_added(android.net.Uri, java.lang.String)" class="hiddenlink" target="rightframe"><b>openAssetFile</b>
+(<code>Uri, String</code>)</A></nobr><br>
+<nobr><A HREF="android.content.ContentResolver.html#android.content.ContentResolver.openAssetFileDescriptor_added(android.net.Uri, java.lang.String)" class="hiddenlink" target="rightframe"><b>openAssetFileDescriptor</b>
+(<code>Uri, String</code>)</A></nobr><br>
+<nobr><A HREF="android.content.ContentResolver.html#android.content.ContentResolver.openOutputStream_added(android.net.Uri, java.lang.String)" class="hiddenlink" target="rightframe"><b>openOutputStream</b>
+(<code>Uri, String</code>)</A></nobr><br>
+<nobr><A HREF="android.content.res.Resources.html#android.content.res.Resources.openRawResource_added(int, android.util.TypedValue)" class="hiddenlink" target="rightframe"><b>openRawResource</b>
+(<code>int, TypedValue</code>)</A></nobr><br>
+<A NAME="P"></A>
+<br><font size="+2">P</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="java.util.logging.Level.html#java.util.logging.Level.parse_changed(java.lang.String)" class="hiddenlink" target="rightframe">parse
+(<code>String</code>)</A></nobr><br>
+<nobr><A HREF="android.content.res.Resources.html#android.content.res.Resources.parseBundleExtra_added(java.lang.String, android.util.AttributeSet, android.os.Bundle)" class="hiddenlink" target="rightframe"><b>parseBundleExtra</b>
+(<code>String, AttributeSet, Bundle</code>)</A></nobr><br>
+<nobr><A HREF="android.content.res.Resources.html#android.content.res.Resources.parseBundleExtras_added(android.content.res.XmlResourceParser, android.os.Bundle)" class="hiddenlink" target="rightframe"><b>parseBundleExtras</b>
+(<code>XmlResourceParser, Bundle</code>)</A></nobr><br>
+<nobr><A HREF="android.content.BroadcastReceiver.html#android.content.BroadcastReceiver.peekService_added(android.content.Context, android.content.Intent)" class="hiddenlink" target="rightframe"><b>peekService</b>
+(<code>Context, Intent</code>)</A></nobr><br>
+<i>performHapticFeedback</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.view.View.html#android.view.View.performHapticFeedback_added(int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>int</code>)</b>&nbsp;in&nbsp;android.view.View
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.view.View.html#android.view.View.performHapticFeedback_added(int, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>int, int</code>)</b>&nbsp;in&nbsp;android.view.View
+</A></nobr><br>
+<i>playSoundEffect</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.playSoundEffect_added(int, float)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>int, float</code>)</b>&nbsp;in&nbsp;android.media.AudioManager
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.view.View.html#android.view.View.playSoundEffect_changed(int)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>int</code>)&nbsp;in&nbsp;android.view.View
+</A></nobr><br>
+<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.prepare_changed()" class="hiddenlink" target="rightframe">prepare
+()</A></nobr><br>
+<nobr><A HREF="android.provider.Settings.System.html#android.provider.Settings.System.putLong_added(android.content.ContentResolver, java.lang.String, long)" class="hiddenlink" target="rightframe"><b>putLong</b>
+(<code>ContentResolver, String, long</code>)</A></nobr><br>
+<A NAME="R"></A>
+<br><font size="+2">R</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.graphics.RectF.html#android.graphics.RectF.readFromParcel_added(android.os.Parcel)" class="hiddenlink" target="rightframe"><b>readFromParcel</b>
+(<code>Parcel</code>)</A></nobr><br>
+<nobr><A HREF="android.os.Parcel.html#android.os.Parcel.readHashMap_changed(java.lang.ClassLoader)" class="hiddenlink" target="rightframe">readHashMap
+(<code>ClassLoader</code>)</A></nobr><br>
+<nobr><A HREF="android.os.Parcel.html#android.os.Parcel.readMap_changed(java.util.Map, java.lang.ClassLoader)" class="hiddenlink" target="rightframe">readMap
+(<code>Map, ClassLoader</code>)</A></nobr><br>
+<i>registerListener</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.registerListener_added(android.hardware.SensorEventListener, android.hardware.Sensor, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>SensorEventListener, Sensor, int</code>)</b>&nbsp;in&nbsp;android.hardware.SensorManager
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.registerListener_added(android.hardware.SensorEventListener, android.hardware.Sensor, int, android.os.Handler)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>SensorEventListener, Sensor, int, Handler</code>)</b>&nbsp;in&nbsp;android.hardware.SensorManager
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.registerListener_changed(android.hardware.SensorListener, int)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>SensorListener, int</code>)&nbsp;in&nbsp;android.hardware.SensorManager
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.registerListener_changed(android.hardware.SensorListener, int, int)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>SensorListener, int, int</code>)&nbsp;in&nbsp;android.hardware.SensorManager
+</A></nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.remapCoordinateSystem_added(float[], int, int, float[])" class="hiddenlink" target="rightframe"><b>remapCoordinateSystem</b>
+(<code>float[], int, int, float[]</code>)</A></nobr><br>
+<nobr><A HREF="android.util.SparseIntArray.html#android.util.SparseIntArray.removeAt_added(int)" class="hiddenlink" target="rightframe"><b>removeAt</b>
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.removeGpsStatusListener_added(android.location.GpsStatus.Listener)" class="hiddenlink" target="rightframe"><b>removeGpsStatusListener</b>
+(<code>Listener</code>)</A></nobr><br>
+<nobr><A HREF="android.view.ViewTreeObserver.html#android.view.ViewTreeObserver.removeOnScrollChangedListener_added(android.view.ViewTreeObserver.OnScrollChangedListener)" class="hiddenlink" target="rightframe"><b>removeOnScrollChangedListener</b>
+(<code>OnScrollChangedListener</code>)</A></nobr><br>
+<i>removePropertyChangeListener</i><br>
+&nbsp;&nbsp;<nobr><A HREF="java.util.jar.Pack200.Packer.html#java.util.jar.Pack200.Packer.removePropertyChangeListener_added(java.beans.PropertyChangeListener)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>PropertyChangeListener</code>)</b>&nbsp;in&nbsp;java.util.jar.Pack200.Packer
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="java.util.jar.Pack200.Unpacker.html#java.util.jar.Pack200.Unpacker.removePropertyChangeListener_added(java.beans.PropertyChangeListener)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>PropertyChangeListener</code>)</b>&nbsp;in&nbsp;java.util.jar.Pack200.Unpacker
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="java.util.logging.LogManager.html#java.util.logging.LogManager.removePropertyChangeListener_added(java.beans.PropertyChangeListener)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>PropertyChangeListener</code>)</b>&nbsp;in&nbsp;java.util.logging.LogManager
+</A></nobr><br>
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.removeTestProvider_added(java.lang.String)" class="hiddenlink" target="rightframe"><b>removeTestProvider</b>
+(<code>String</code>)</A></nobr><br>
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.removeUpdates_added(android.app.PendingIntent)" class="hiddenlink" target="rightframe"><b>removeUpdates</b>
+(<code>PendingIntent</code>)</A></nobr><br>
+<i>replaceExtras</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.content.Intent.html#android.content.Intent.replaceExtras_added(android.content.Intent)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Intent</code>)</b>&nbsp;in&nbsp;android.content.Intent
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.content.Intent.html#android.content.Intent.replaceExtras_added(android.os.Bundle)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Bundle</code>)</b>&nbsp;in&nbsp;android.content.Intent
+</A></nobr><br>
+<nobr><A HREF="android.view.ViewParent.html#android.view.ViewParent.requestChildRectangleOnScreen_added(android.view.View, android.graphics.Rect, boolean)" class="hiddenlink" target="rightframe"><b>requestChildRectangleOnScreen</b>
+(<code>View, Rect, boolean</code>)</A></nobr><br>
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.requestLocationUpdates_added(java.lang.String, long, float, android.app.PendingIntent)" class="hiddenlink" target="rightframe"><b>requestLocationUpdates</b>
+(<code>String, long, float, PendingIntent</code>)</A></nobr><br>
+<nobr><A HREF="android.text.method.MetaKeyKeyListener.html#android.text.method.MetaKeyKeyListener.resetLockedMeta_added(long)" class="hiddenlink" target="rightframe"><b>resetLockedMeta</b>
+(<code>long</code>)</A></nobr><br>
+<nobr><A HREF="android.app.ActivityManager.html#android.app.ActivityManager.restartPackage_added(java.lang.String)" class="hiddenlink" target="rightframe"><b>restartPackage</b>
+(<code>String</code>)</A></nobr><br>
+<nobr><A HREF="android.webkit.WebView.html#android.webkit.WebView.restorePicture_added(android.os.Bundle, java.io.File)" class="hiddenlink" target="rightframe"><b>restorePicture</b>
+(<code>Bundle, File</code>)</A></nobr><br>
+<nobr><A HREF="android.test.InstrumentationTestCase.html#android.test.InstrumentationTestCase.runTestOnUiThread_added(java.lang.Runnable)" class="hiddenlink" target="rightframe"><b>runTestOnUiThread</b>
+(<code>Runnable</code>)</A></nobr><br>
+<A NAME="S"></A>
+<br><font size="+2">S</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.webkit.WebView.html#android.webkit.WebView.savePicture_added(android.os.Bundle, java.io.File)" class="hiddenlink" target="rightframe"><b>savePicture</b>
+(<code>Bundle, File</code>)</A></nobr><br>
+<i>scrollToBottom</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.scrollToBottom_added(android.test.InstrumentationTestCase, android.app.Activity, android.view.ViewGroup)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>InstrumentationTestCase, Activity, ViewGroup</code>)</b>&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.scrollToBottom_changed(android.test.ActivityInstrumentationTestCase, android.view.ViewGroup)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>ActivityInstrumentationTestCase, ViewGroup</code>)&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+<i>scrollToTop</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.scrollToTop_added(android.test.InstrumentationTestCase, android.app.Activity, android.view.ViewGroup)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>InstrumentationTestCase, Activity, ViewGroup</code>)</b>&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.scrollToTop_changed(android.test.ActivityInstrumentationTestCase, android.view.ViewGroup)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>ActivityInstrumentationTestCase, ViewGroup</code>)&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.sendExtraCommand_added(java.lang.String, java.lang.String, android.os.Bundle)" class="hiddenlink" target="rightframe"><b>sendExtraCommand</b>
+(<code>String, String, Bundle</code>)</A></nobr><br>
+<nobr><A HREF="android.webkit.UrlInterceptHandler.html#android.webkit.UrlInterceptHandler.service_changed(java.lang.String, java.util.Map<java.lang.String, java.lang.String>)" class="hiddenlink" target="rightframe">service
+(<code>String, Map&lt;String, String&gt;</code>)</A></nobr><br>
+<nobr><A HREF="android.webkit.WebSettings.html#android.webkit.WebSettings.setAllowFileAccess_added(boolean)" class="hiddenlink" target="rightframe"><b>setAllowFileAccess</b>
+(<code>boolean</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setBitmap_added(int, java.lang.String, android.graphics.Bitmap)" class="hiddenlink" target="rightframe"><b>setBitmap</b>
+(<code>int, String, Bitmap</code>)</A></nobr><br>
+<nobr><A HREF="android.media.AudioManager.html#android.media.AudioManager.setBluetoothA2dpOn_added(boolean)" class="hiddenlink" target="rightframe"><b>setBluetoothA2dpOn</b>
+(<code>boolean</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setBoolean_added(int, java.lang.String, boolean)" class="hiddenlink" target="rightframe"><b>setBoolean</b>
+(<code>int, String, boolean</code>)</A></nobr><br>
+<nobr><A HREF="android.webkit.WebSettings.html#android.webkit.WebSettings.setBuiltInZoomControls_added(boolean)" class="hiddenlink" target="rightframe"><b>setBuiltInZoomControls</b>
+(<code>boolean</code>)</A></nobr><br>
+<i>setButton</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.app.AlertDialog.html#android.app.AlertDialog.setButton_added(java.lang.CharSequence, android.content.DialogInterface.OnClickListener)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>CharSequence, OnClickListener</code>)</b>&nbsp;in&nbsp;android.app.AlertDialog
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.app.AlertDialog.html#android.app.AlertDialog.setButton_added(java.lang.CharSequence, android.os.Message)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>CharSequence, Message</code>)</b>&nbsp;in&nbsp;android.app.AlertDialog
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.app.AlertDialog.html#android.app.AlertDialog.setButton_changed(int, java.lang.CharSequence, android.content.DialogInterface.OnClickListener)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>int, CharSequence, OnClickListener</code>)&nbsp;in&nbsp;android.app.AlertDialog
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.app.AlertDialog.html#android.app.AlertDialog.setButton_changed(int, java.lang.CharSequence, android.os.Message)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>int, CharSequence, Message</code>)&nbsp;in&nbsp;android.app.AlertDialog
+</A></nobr><br>
+<i>setButton2</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.app.AlertDialog.html#android.app.AlertDialog.setButton2_changed(java.lang.CharSequence, android.content.DialogInterface.OnClickListener)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>CharSequence, OnClickListener</code>)&nbsp;in&nbsp;android.app.AlertDialog
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.app.AlertDialog.html#android.app.AlertDialog.setButton2_changed(java.lang.CharSequence, android.os.Message)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>CharSequence, Message</code>)&nbsp;in&nbsp;android.app.AlertDialog
+</A></nobr><br>
+<i>setButton3</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.app.AlertDialog.html#android.app.AlertDialog.setButton3_changed(java.lang.CharSequence, android.content.DialogInterface.OnClickListener)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>CharSequence, OnClickListener</code>)&nbsp;in&nbsp;android.app.AlertDialog
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.app.AlertDialog.html#android.app.AlertDialog.setButton3_changed(java.lang.CharSequence, android.os.Message)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>CharSequence, Message</code>)&nbsp;in&nbsp;android.app.AlertDialog
+</A></nobr><br>
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setByte_added(int, java.lang.String, byte)" class="hiddenlink" target="rightframe"><b>setByte</b>
+(<code>int, String, byte</code>)</A></nobr><br>
+<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.setCamera_added(android.hardware.Camera)" class="hiddenlink" target="rightframe"><b>setCamera</b>
+(<code>Camera</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setChar_added(int, java.lang.String, char)" class="hiddenlink" target="rightframe"><b>setChar</b>
+(<code>int, String, char</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setCharSequence_added(int, java.lang.String, java.lang.CharSequence)" class="hiddenlink" target="rightframe"><b>setCharSequence</b>
+(<code>int, String, CharSequence</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.setClippingEnabled_added(boolean)" class="hiddenlink" target="rightframe"><b>setClippingEnabled</b>
+(<code>boolean</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.setCompoundDrawablesWithIntrinsicBounds_added(int, int, int, int)" class="hiddenlink" target="rightframe"><b>setCompoundDrawablesWithIntrinsicBounds</b>
+(<code>int, int, int, int</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setDouble_added(int, java.lang.String, double)" class="hiddenlink" target="rightframe"><b>setDouble</b>
+(<code>int, String, double</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.AutoCompleteTextView.html#android.widget.AutoCompleteTextView.setDropDownAnchor_added(int)" class="hiddenlink" target="rightframe"><b>setDropDownAnchor</b>
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.AutoCompleteTextView.html#android.widget.AutoCompleteTextView.setDropDownWidth_added(int)" class="hiddenlink" target="rightframe"><b>setDropDownWidth</b>
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.setExtractedText_added(android.view.inputmethod.ExtractedText)" class="hiddenlink" target="rightframe"><b>setExtractedText</b>
+(<code>ExtractedText</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.AbsListView.html#android.widget.AbsListView.setFastScrollEnabled_added(boolean)" class="hiddenlink" target="rightframe"><b>setFastScrollEnabled</b>
+(<code>boolean</code>)</A></nobr><br>
+<nobr><A HREF="android.view.animation.Animation.html#android.view.animation.Animation.setFillEnabled_added(boolean)" class="hiddenlink" target="rightframe"><b>setFillEnabled</b>
+(<code>boolean</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setFloat_added(int, java.lang.String, float)" class="hiddenlink" target="rightframe"><b>setFloat</b>
+(<code>int, String, float</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.ListView.html#android.widget.ListView.setFooterDividersEnabled_added(boolean)" class="hiddenlink" target="rightframe"><b>setFooterDividersEnabled</b>
+(<code>boolean</code>)</A></nobr><br>
+<nobr><A HREF="android.view.View.html#android.view.View.setHapticFeedbackEnabled_added(boolean)" class="hiddenlink" target="rightframe"><b>setHapticFeedbackEnabled</b>
+(<code>boolean</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.ListView.html#android.widget.ListView.setHeaderDividersEnabled_added(boolean)" class="hiddenlink" target="rightframe"><b>setHeaderDividersEnabled</b>
+(<code>boolean</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setImageViewBitmap_added(int, android.graphics.Bitmap)" class="hiddenlink" target="rightframe"><b>setImageViewBitmap</b>
+(<code>int, Bitmap</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.setImeActionLabel_added(java.lang.CharSequence, int)" class="hiddenlink" target="rightframe"><b>setImeActionLabel</b>
+(<code>CharSequence, int</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.setImeOptions_added(int)" class="hiddenlink" target="rightframe"><b>setImeOptions</b>
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.app.AlarmManager.html#android.app.AlarmManager.setInexactRepeating_added(int, long, long, android.app.PendingIntent)" class="hiddenlink" target="rightframe"><b>setInexactRepeating</b>
+(<code>int, long, long, PendingIntent</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.setInputExtras_added(int)" class="hiddenlink" target="rightframe"><b>setInputExtras</b>
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.setInputMethodMode_added(int)" class="hiddenlink" target="rightframe"><b>setInputMethodMode</b>
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.setInputType_added(int)" class="hiddenlink" target="rightframe"><b>setInputType</b>
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setInt_added(int, java.lang.String, int)" class="hiddenlink" target="rightframe"><b>setInt</b>
+(<code>int, String, int</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.AbsSeekBar.html#android.widget.AbsSeekBar.setKeyProgressIncrement_added(int)" class="hiddenlink" target="rightframe"><b>setKeyProgressIncrement</b>
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.AutoCompleteTextView.html#android.widget.AutoCompleteTextView.setListSelection_added(int)" class="hiddenlink" target="rightframe"><b>setListSelection</b>
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setLong_added(int, java.lang.String, long)" class="hiddenlink" target="rightframe"><b>setLong</b>
+(<code>int, String, long</code>)</A></nobr><br>
+<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.setMaxDuration_added(int)" class="hiddenlink" target="rightframe"><b>setMaxDuration</b>
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.setMaxFileSize_added(long)" class="hiddenlink" target="rightframe"><b>setMaxFileSize</b>
+(<code>long</code>)</A></nobr><br>
+<nobr><A HREF="android.webkit.WebView.html#android.webkit.WebView.setNetworkAvailable_added(boolean)" class="hiddenlink" target="rightframe"><b>setNetworkAvailable</b>
+(<code>boolean</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.Chronometer.html#android.widget.Chronometer.setOnChronometerTickListener_added(android.widget.Chronometer.OnChronometerTickListener)" class="hiddenlink" target="rightframe"><b>setOnChronometerTickListener</b>
+(<code>OnChronometerTickListener</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setOnClickPendingIntent_added(int, android.app.PendingIntent)" class="hiddenlink" target="rightframe"><b>setOnClickPendingIntent</b>
+(<code>int, PendingIntent</code>)</A></nobr><br>
+<nobr><A HREF="android.view.GestureDetector.html#android.view.GestureDetector.setOnDoubleTapListener_added(android.view.GestureDetector.OnDoubleTapListener)" class="hiddenlink" target="rightframe"><b>setOnDoubleTapListener</b>
+(<code>OnDoubleTapListener</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.setOnEditorActionListener_added(android.widget.TextView.OnEditorActionListener)" class="hiddenlink" target="rightframe"><b>setOnEditorActionListener</b>
+(<code>OnEditorActionListener</code>)</A></nobr><br>
+<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.setOnErrorListener_added(android.media.MediaRecorder.OnErrorListener)" class="hiddenlink" target="rightframe"><b>setOnErrorListener</b>
+(<code>OnErrorListener</code>)</A></nobr><br>
+<nobr><A HREF="android.hardware.Camera.html#android.hardware.Camera.setOneShotPreviewCallback_added(android.hardware.Camera.PreviewCallback)" class="hiddenlink" target="rightframe"><b>setOneShotPreviewCallback</b>
+(<code>PreviewCallback</code>)</A></nobr><br>
+<i>setOnInfoListener</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.media.MediaPlayer.html#android.media.MediaPlayer.setOnInfoListener_added(android.media.MediaPlayer.OnInfoListener)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>OnInfoListener</code>)</b>&nbsp;in&nbsp;android.media.MediaPlayer
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.setOnInfoListener_added(android.media.MediaRecorder.OnInfoListener)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>OnInfoListener</code>)</b>&nbsp;in&nbsp;android.media.MediaRecorder
+</A></nobr><br>
+<nobr><A HREF="android.media.MediaPlayer.html#android.media.MediaPlayer.setOnVideoSizeChangedListener_added(android.media.MediaPlayer.OnVideoSizeChangedListener)" class="hiddenlink" target="rightframe"><b>setOnVideoSizeChangedListener</b>
+(<code>OnVideoSizeChangedListener</code>)</A></nobr><br>
+<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.setOutputFile_added(java.io.FileDescriptor)" class="hiddenlink" target="rightframe"><b>setOutputFile</b>
+(<code>FileDescriptor</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.setOutsideTouchable_added(boolean)" class="hiddenlink" target="rightframe"><b>setOutsideTouchable</b>
+(<code>boolean</code>)</A></nobr><br>
+<nobr><A HREF="android.hardware.Camera.html#android.hardware.Camera.setPreviewDisplay_changed(android.view.SurfaceHolder)" class="hiddenlink" target="rightframe">setPreviewDisplay
+(<code>SurfaceHolder</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.setPrivateImeOptions_added(java.lang.String)" class="hiddenlink" target="rightframe"><b>setPrivateImeOptions</b>
+(<code>String</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.TextView.html#android.widget.TextView.setRawInputType_added(int)" class="hiddenlink" target="rightframe"><b>setRawInputType</b>
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.view.View.html#android.view.View.setScrollContainer_added(boolean)" class="hiddenlink" target="rightframe"><b>setScrollContainer</b>
+(<code>boolean</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setShort_added(int, java.lang.String, short)" class="hiddenlink" target="rightframe"><b>setShort</b>
+(<code>int, String, short</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.AbsListView.html#android.widget.AbsListView.setSmoothScrollbarEnabled_added(boolean)" class="hiddenlink" target="rightframe"><b>setSmoothScrollbarEnabled</b>
+(<code>boolean</code>)</A></nobr><br>
+<nobr><A HREF="android.view.Window.html#android.view.Window.setSoftInputMode_added(int)" class="hiddenlink" target="rightframe"><b>setSoftInputMode</b>
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.view.ViewGroup.html#android.view.ViewGroup.setStaticTransformationsEnabled_added(boolean)" class="hiddenlink" target="rightframe"><b>setStaticTransformationsEnabled</b>
+(<code>boolean</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setString_added(int, java.lang.String, java.lang.String)" class="hiddenlink" target="rightframe"><b>setString</b>
+(<code>int, String, String</code>)</A></nobr><br>
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.setTestProviderEnabled_added(java.lang.String, boolean)" class="hiddenlink" target="rightframe"><b>setTestProviderEnabled</b>
+(<code>String, boolean</code>)</A></nobr><br>
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.setTestProviderLocation_added(java.lang.String, android.location.Location)" class="hiddenlink" target="rightframe"><b>setTestProviderLocation</b>
+(<code>String, Location</code>)</A></nobr><br>
+<nobr><A HREF="android.location.LocationManager.html#android.location.LocationManager.setTestProviderStatus_added(java.lang.String, int, android.os.Bundle, long)" class="hiddenlink" target="rightframe"><b>setTestProviderStatus</b>
+(<code>String, int, Bundle, long</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setTextColor_added(int, int)" class="hiddenlink" target="rightframe"><b>setTextColor</b>
+(<code>int, int</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.setTouchable_added(boolean)" class="hiddenlink" target="rightframe"><b>setTouchable</b>
+(<code>boolean</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.setTouchInterceptor_added(android.view.View.OnTouchListener)" class="hiddenlink" target="rightframe"><b>setTouchInterceptor</b>
+(<code>OnTouchListener</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.RemoteViews.html#android.widget.RemoteViews.setUri_added(int, java.lang.String, android.net.Uri)" class="hiddenlink" target="rightframe"><b>setUri</b>
+(<code>int, String, Uri</code>)</A></nobr><br>
+<nobr><A HREF="android.webkit.WebSettings.html#android.webkit.WebSettings.setUserAgent_changed(int)" class="hiddenlink" target="rightframe">setUserAgent
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.webkit.WebSettings.html#android.webkit.WebSettings.setUserAgentString_added(java.lang.String)" class="hiddenlink" target="rightframe"><b>setUserAgentString</b>
+(<code>String</code>)</A></nobr><br>
+<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.setVideoEncoder_added(int)" class="hiddenlink" target="rightframe"><b>setVideoEncoder</b>
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.setVideoFrameRate_added(int)" class="hiddenlink" target="rightframe"><b>setVideoFrameRate</b>
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.setVideoSize_added(int, int)" class="hiddenlink" target="rightframe"><b>setVideoSize</b>
+(<code>int, int</code>)</A></nobr><br>
+<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.setVideoSource_added(int)" class="hiddenlink" target="rightframe"><b>setVideoSource</b>
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.app.AlertDialog.html#android.app.AlertDialog.setView_added(android.view.View, int, int, int, int)" class="hiddenlink" target="rightframe"><b>setView</b>
+(<code>View, int, int, int, int</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.ResourceCursorAdapter.html#android.widget.ResourceCursorAdapter.setViewResource_added(int)" class="hiddenlink" target="rightframe"><b>setViewResource</b>
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.app.Activity.html#android.app.Activity.setVisible_added(boolean)" class="hiddenlink" target="rightframe"><b>setVisible</b>
+(<code>boolean</code>)</A></nobr><br>
+<nobr><A HREF="android.view.Window.html#android.view.Window.setWindowAnimations_added(int)" class="hiddenlink" target="rightframe"><b>setWindowAnimations</b>
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.setWindowLayoutMode_added(int, int)" class="hiddenlink" target="rightframe"><b>setWindowLayoutMode</b>
+(<code>int, int</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.ArrayAdapter.html#android.widget.ArrayAdapter.sort_added(java.util.Comparator<? super T>)" class="hiddenlink" target="rightframe"><b>sort</b>
+(<code>Comparator&lt;? super T&gt;</code>)</A></nobr><br>
+<A NAME="T"></A>
+<br><font size="+2">T</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<i>toShortString</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.graphics.Rect.html#android.graphics.Rect.toShortString_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.graphics.Rect
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.view.animation.Transformation.html#android.view.animation.Transformation.toShortString_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.view.animation.Transformation
+</A></nobr><br>
+<A NAME="U"></A>
+<br><font size="+2">U</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<i>unregisterListener</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.unregisterListener_added(android.hardware.SensorEventListener)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>SensorEventListener</code>)</b>&nbsp;in&nbsp;android.hardware.SensorManager
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.unregisterListener_added(android.hardware.SensorEventListener, android.hardware.Sensor)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>SensorEventListener, Sensor</code>)</b>&nbsp;in&nbsp;android.hardware.SensorManager
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.unregisterListener_changed(android.hardware.SensorListener)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>SensorListener</code>)&nbsp;in&nbsp;android.hardware.SensorManager
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.unregisterListener_changed(android.hardware.SensorListener, int)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>SensorListener, int</code>)&nbsp;in&nbsp;android.hardware.SensorManager
+</A></nobr><br>
+<i>update</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.update_added()" class="hiddenlink" target="rightframe">type&nbsp;<b>
+()</b>&nbsp;in&nbsp;android.widget.PopupWindow
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.widget.PopupWindow.html#android.widget.PopupWindow.update_added(int, int, int, int, boolean)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>int, int, int, int, boolean</code>)</b>&nbsp;in&nbsp;android.widget.PopupWindow
+</A></nobr><br>
+<A NAME="W"></A>
+<br><font size="+2">W</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.os.Parcel.html#android.os.Parcel.writeMap_changed(java.util.Map)" class="hiddenlink" target="rightframe">writeMap
+(<code>Map</code>)</A></nobr><br>
+<i>writeToParcel</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.content.res.AssetFileDescriptor.html#android.content.res.AssetFileDescriptor.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.content.res.AssetFileDescriptor
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.graphics.RectF.html#android.graphics.RectF.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.graphics.RectF
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.Annotation.html#android.text.Annotation.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.Annotation
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.AbsoluteSizeSpan.html#android.text.style.AbsoluteSizeSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.AbsoluteSizeSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.AlignmentSpan.Standard.html#android.text.style.AlignmentSpan.Standard.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.AlignmentSpan.Standard
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.BackgroundColorSpan.html#android.text.style.BackgroundColorSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.BackgroundColorSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.BulletSpan.html#android.text.style.BulletSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.BulletSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.ForegroundColorSpan.html#android.text.style.ForegroundColorSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.ForegroundColorSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.LeadingMarginSpan.Standard.html#android.text.style.LeadingMarginSpan.Standard.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.LeadingMarginSpan.Standard
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.QuoteSpan.html#android.text.style.QuoteSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.QuoteSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.RelativeSizeSpan.html#android.text.style.RelativeSizeSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.RelativeSizeSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.ScaleXSpan.html#android.text.style.ScaleXSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.ScaleXSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.StrikethroughSpan.html#android.text.style.StrikethroughSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.StrikethroughSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.StyleSpan.html#android.text.style.StyleSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.StyleSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.SubscriptSpan.html#android.text.style.SubscriptSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.SubscriptSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.SuperscriptSpan.html#android.text.style.SuperscriptSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.SuperscriptSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.TextAppearanceSpan.html#android.text.style.TextAppearanceSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.TextAppearanceSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.TypefaceSpan.html#android.text.style.TypefaceSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.TypefaceSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.URLSpan.html#android.text.style.URLSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.URLSpan
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.text.style.UnderlineSpan.html#android.text.style.UnderlineSpan.writeToParcel_added(android.os.Parcel, int)" class="hiddenlink" target="rightframe">type&nbsp;<b>
+(<code>Parcel, int</code>)</b>&nbsp;in&nbsp;android.text.style.UnderlineSpan
+</A></nobr><br>
+<A NAME="Y"></A>
+<br><font size="+2">Y</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#H"><font size="-2">H</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.database.sqlite.SQLiteDatabase.html#android.database.sqlite.SQLiteDatabase.yieldIfContended_changed()" class="hiddenlink" target="rightframe">yieldIfContended
+()</A></nobr><br>
+<nobr><A HREF="android.database.sqlite.SQLiteDatabase.html#android.database.sqlite.SQLiteDatabase.yieldIfContendedSafely_added()" class="hiddenlink" target="rightframe"><b>yieldIfContendedSafely</b>
+()</A></nobr><br>
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/methods_index_changes.html b/docs/html/sdk/api_diff/3/changes/methods_index_changes.html
new file mode 100644
index 000000000000..1b1b305b9a44
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/methods_index_changes.html
@@ -0,0 +1,466 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+Method Changes Index
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY class="gc-documentation">
+<a NAME="topheader"></a>
+<table summary="Index for Methods" width="100%" class="jdiffIndex" border="0" cellspacing="0" cellpadding="0" style="padding-bottom:0;margin-bottom:0;">
+  <tr>
+  <th class="indexHeader">
+    Filter the Index:
+  </th>
+  </tr>
+  <tr>
+  <td class="indexText" style="line-height:1.3em;padding-left:2em;">
+<a href="methods_index_all.html" class="staysblack">All Methods</a>
+  <br>
+<font color="#999999">Removals</font>
+  <br>
+<A HREF="methods_index_additions.html"xclass="hiddenlink">Additions</A>
+  <br>
+<b>Changes</b>
+  </td>
+  </tr>
+</table>
+<div id="indexTableCaption">
+<font size="-2"><strong>Bold</strong>&nbsp;indicates&nbsp;New;&nbsp;<strike>Strike</strike>&nbsp;indicates&nbsp;deleted. Plain indicates changed.</font>
+</div>
+<A NAME="A"></A>
+<br><font size="+2">A</font>&nbsp;
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.test.suitebuilder.TestSuiteBuilder.html#android.test.suitebuilder.TestSuiteBuilder.addRequirements_changed(com.android.internal.util.Predicate<android.test.suitebuilder.TestMethod>...)" class="hiddenlink" target="rightframe">addRequirements
+(<code>Predicate&lt;TestMethod&gt;</code>)</A></nobr><br>
+<nobr><A HREF="android.database.DatabaseUtils.html#android.database.DatabaseUtils.appendEscapedSQLString_changed(java.lang.StringBuilder, java.lang.String)" class="hiddenlink" target="rightframe">appendEscapedSQLString
+(<code>StringBuilder, String</code>)</A></nobr><br>
+<A NAME="C"></A>
+<br><font size="+2">C</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.os.Debug.html#android.os.Debug.changeDebugPort_changed(int)" class="hiddenlink" target="rightframe">changeDebugPort
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.graphics.drawable.shapes.Shape.html#android.graphics.drawable.shapes.Shape.clone_changed()" class="hiddenlink" target="rightframe">clone
+()</A></nobr><br>
+<A NAME="D"></A>
+<br><font size="+2">D</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.drag_changed(android.test.ActivityInstrumentationTestCase, float, float, float, float, int)" class="hiddenlink" target="rightframe">drag
+(<code>ActivityInstrumentationTestCase, float, float, float, float, int</code>)</A></nobr><br>
+<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragQuarterScreenDown_changed(android.test.ActivityInstrumentationTestCase)" class="hiddenlink" target="rightframe">dragQuarterScreenDown
+(<code>ActivityInstrumentationTestCase</code>)</A></nobr><br>
+<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragQuarterScreenUp_changed(android.test.ActivityInstrumentationTestCase)" class="hiddenlink" target="rightframe">dragQuarterScreenUp
+(<code>ActivityInstrumentationTestCase</code>)</A></nobr><br>
+<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewBy_changed(android.test.ActivityInstrumentationTestCase, android.view.View, int, int, int)" class="hiddenlink" target="rightframe">dragViewBy
+(<code>ActivityInstrumentationTestCase, View, int, int, int</code>)</A></nobr><br>
+<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewTo_changed(android.test.ActivityInstrumentationTestCase, android.view.View, int, int, int)" class="hiddenlink" target="rightframe">dragViewTo
+(<code>ActivityInstrumentationTestCase, View, int, int, int</code>)</A></nobr><br>
+<i>dragViewToBottom</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewToBottom_changed(android.test.ActivityInstrumentationTestCase, android.view.View)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>ActivityInstrumentationTestCase, View</code>)&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewToBottom_changed(android.test.InstrumentationTestCase, android.app.Activity, android.view.View)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>InstrumentationTestCase, Activity, View</code>)&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+<i>dragViewToTop</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewToTop_changed(android.test.ActivityInstrumentationTestCase, android.view.View)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>ActivityInstrumentationTestCase, View</code>)&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewToTop_changed(android.test.ActivityInstrumentationTestCase, android.view.View, int)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>ActivityInstrumentationTestCase, View, int</code>)&nbsp;in&nbsp;android.test.TouchUtils
+</A></nobr><br>
+<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewToX_changed(android.test.ActivityInstrumentationTestCase, android.view.View, int, int)" class="hiddenlink" target="rightframe">dragViewToX
+(<code>ActivityInstrumentationTestCase, View, int, int</code>)</A></nobr><br>
+<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.dragViewToY_changed(android.test.ActivityInstrumentationTestCase, android.view.View, int, int)" class="hiddenlink" target="rightframe">dragViewToY
+(<code>ActivityInstrumentationTestCase, View, int, int</code>)</A></nobr><br>
+<A NAME="F"></A>
+<br><font size="+2">F</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="dalvik.system.Zygote.html#dalvik.system.Zygote.forkAndSpecialize_changed(int, int, int[], boolean, int[][])" class="hiddenlink" target="rightframe">forkAndSpecialize
+(<code>int, int, int[], boolean, int[][]</code>)</A></nobr><br>
+<nobr><A HREF="dalvik.system.Zygote.html#dalvik.system.Zygote.forkSystemServer_changed(int, int, int[], boolean, int[][])" class="hiddenlink" target="rightframe">forkSystemServer
+(<code>int, int, int[], boolean, int[][]</code>)</A></nobr><br>
+<nobr><A HREF="java.lang.Character.UnicodeBlock.html#java.lang.Character.UnicodeBlock.forName_changed(java.lang.String)" class="hiddenlink" target="rightframe">forName
+(<code>String</code>)</A></nobr><br>
+<A NAME="G"></A>
+<br><font size="+2">G</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="java.lang.Class.html#java.lang.Class.getClasses_changed()" class="hiddenlink" target="rightframe">getClasses
+()</A></nobr><br>
+<i>getColumnIndex</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.database.Cursor.html#android.database.Cursor.getColumnIndex_changed(java.lang.String)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>String</code>)&nbsp;in&nbsp;android.database.Cursor
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.database.CursorWrapper.html#android.database.CursorWrapper.getColumnIndex_changed(java.lang.String)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>String</code>)&nbsp;in&nbsp;android.database.CursorWrapper
+</A></nobr><br>
+<nobr><A HREF="java.lang.Class.html#java.lang.Class.getConstructors_changed()" class="hiddenlink" target="rightframe">getConstructors
+()</A></nobr><br>
+<nobr><A HREF="android.widget.CursorAdapter.html#android.widget.CursorAdapter.getCount_changed()" class="hiddenlink" target="rightframe">getCount
+()</A></nobr><br>
+<nobr><A HREF="java.lang.Class.html#java.lang.Class.getDeclaredClasses_changed()" class="hiddenlink" target="rightframe">getDeclaredClasses
+()</A></nobr><br>
+<nobr><A HREF="java.lang.Class.html#java.lang.Class.getDeclaredConstructors_changed()" class="hiddenlink" target="rightframe">getDeclaredConstructors
+()</A></nobr><br>
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getEdgeSlop_changed()" class="hiddenlink" target="rightframe">getEdgeSlop
+()</A></nobr><br>
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getFadingEdgeLength_changed()" class="hiddenlink" target="rightframe">getFadingEdgeLength
+()</A></nobr><br>
+<nobr><A HREF="android.view.View.html#android.view.View.getHandler_changed()" class="hiddenlink" target="rightframe">getHandler
+()</A></nobr><br>
+<nobr><A HREF="java.lang.Class.html#java.lang.Class.getInterfaces_changed()" class="hiddenlink" target="rightframe">getInterfaces
+()</A></nobr><br>
+<nobr><A HREF="android.widget.CursorAdapter.html#android.widget.CursorAdapter.getItem_changed(int)" class="hiddenlink" target="rightframe">getItem
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.AutoCompleteTextView.html#android.widget.AutoCompleteTextView.getItemClickListener_changed()" class="hiddenlink" target="rightframe">getItemClickListener
+()</A></nobr><br>
+<nobr><A HREF="android.widget.CursorAdapter.html#android.widget.CursorAdapter.getItemId_changed(int)" class="hiddenlink" target="rightframe">getItemId
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.AutoCompleteTextView.html#android.widget.AutoCompleteTextView.getItemSelectedListener_changed()" class="hiddenlink" target="rightframe">getItemSelectedListener
+()</A></nobr><br>
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getMaximumDrawingCacheSize_changed()" class="hiddenlink" target="rightframe">getMaximumDrawingCacheSize
+()</A></nobr><br>
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getMinimumFlingVelocity_changed()" class="hiddenlink" target="rightframe">getMinimumFlingVelocity
+()</A></nobr><br>
+<nobr><A HREF="java.lang.reflect.Proxy.html#java.lang.reflect.Proxy.getProxyClass_changed(java.lang.ClassLoader, java.lang.Class<?>...)" class="hiddenlink" target="rightframe">getProxyClass
+(<code>ClassLoader, Class&lt;?&gt;</code>)</A></nobr><br>
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getScrollBarSize_changed()" class="hiddenlink" target="rightframe">getScrollBarSize
+()</A></nobr><br>
+<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.getSensors_changed()" class="hiddenlink" target="rightframe">getSensors
+()</A></nobr><br>
+<nobr><A HREF="android.webkit.UrlInterceptRegistry.html#android.webkit.UrlInterceptRegistry.getSurrogate_changed(java.lang.String, java.util.Map<java.lang.String, java.lang.String>)" class="hiddenlink" target="rightframe">getSurrogate
+(<code>String, Map&lt;String, String&gt;</code>)</A></nobr><br>
+<nobr><A HREF="android.app.LauncherActivity.html#android.app.LauncherActivity.getTargetIntent_changed()" class="hiddenlink" target="rightframe">getTargetIntent
+()</A></nobr><br>
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getTouchSlop_changed()" class="hiddenlink" target="rightframe">getTouchSlop
+()</A></nobr><br>
+<nobr><A HREF="android.webkit.WebSettings.html#android.webkit.WebSettings.getUserAgent_changed()" class="hiddenlink" target="rightframe">getUserAgent
+()</A></nobr><br>
+<nobr><A HREF="android.view.ViewConfiguration.html#android.view.ViewConfiguration.getWindowTouchSlop_changed()" class="hiddenlink" target="rightframe">getWindowTouchSlop
+()</A></nobr><br>
+<nobr><A HREF="android.webkit.WebView.html#android.webkit.WebView.getZoomControls_changed()" class="hiddenlink" target="rightframe">getZoomControls
+()</A></nobr><br>
+<A NAME="I"></A>
+<br><font size="+2">I</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.webkit.URLUtil.html#android.webkit.URLUtil.isCookielessProxyUrl_changed(java.lang.String)" class="hiddenlink" target="rightframe">isCookielessProxyUrl
+(<code>String</code>)</A></nobr><br>
+<A NAME="L"></A>
+<br><font size="+2">L</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.longClickView_changed(android.test.ActivityInstrumentationTestCase, android.view.View)" class="hiddenlink" target="rightframe">longClickView
+(<code>ActivityInstrumentationTestCase, View</code>)</A></nobr><br>
+<A NAME="O"></A>
+<br><font size="+2">O</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.webkit.WebView.html#android.webkit.WebView.onGlobalFocusChanged_changed(android.view.View, android.view.View)" class="hiddenlink" target="rightframe">onGlobalFocusChanged
+(<code>View, View</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.ProgressBar.html#android.widget.ProgressBar.onRestoreInstanceState_changed(android.os.Parcelable)" class="hiddenlink" target="rightframe">onRestoreInstanceState
+(<code>Parcelable</code>)</A></nobr><br>
+<nobr><A HREF="android.widget.ProgressBar.html#android.widget.ProgressBar.onSaveInstanceState_changed()" class="hiddenlink" target="rightframe">onSaveInstanceState
+()</A></nobr><br>
+<A NAME="P"></A>
+<br><font size="+2">P</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="java.util.logging.Level.html#java.util.logging.Level.parse_changed(java.lang.String)" class="hiddenlink" target="rightframe">parse
+(<code>String</code>)</A></nobr><br>
+<nobr><A HREF="android.view.View.html#android.view.View.playSoundEffect_changed(int)" class="hiddenlink" target="rightframe">playSoundEffect
+(<code>int</code>)</A></nobr><br>
+<nobr><A HREF="android.media.MediaRecorder.html#android.media.MediaRecorder.prepare_changed()" class="hiddenlink" target="rightframe">prepare
+()</A></nobr><br>
+<A NAME="R"></A>
+<br><font size="+2">R</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.os.Parcel.html#android.os.Parcel.readHashMap_changed(java.lang.ClassLoader)" class="hiddenlink" target="rightframe">readHashMap
+(<code>ClassLoader</code>)</A></nobr><br>
+<nobr><A HREF="android.os.Parcel.html#android.os.Parcel.readMap_changed(java.util.Map, java.lang.ClassLoader)" class="hiddenlink" target="rightframe">readMap
+(<code>Map, ClassLoader</code>)</A></nobr><br>
+<i>registerListener</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.registerListener_changed(android.hardware.SensorListener, int)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>SensorListener, int</code>)&nbsp;in&nbsp;android.hardware.SensorManager
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.registerListener_changed(android.hardware.SensorListener, int, int)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>SensorListener, int, int</code>)&nbsp;in&nbsp;android.hardware.SensorManager
+</A></nobr><br>
+<A NAME="S"></A>
+<br><font size="+2">S</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.scrollToBottom_changed(android.test.ActivityInstrumentationTestCase, android.view.ViewGroup)" class="hiddenlink" target="rightframe">scrollToBottom
+(<code>ActivityInstrumentationTestCase, ViewGroup</code>)</A></nobr><br>
+<nobr><A HREF="android.test.TouchUtils.html#android.test.TouchUtils.scrollToTop_changed(android.test.ActivityInstrumentationTestCase, android.view.ViewGroup)" class="hiddenlink" target="rightframe">scrollToTop
+(<code>ActivityInstrumentationTestCase, ViewGroup</code>)</A></nobr><br>
+<nobr><A HREF="android.webkit.UrlInterceptHandler.html#android.webkit.UrlInterceptHandler.service_changed(java.lang.String, java.util.Map<java.lang.String, java.lang.String>)" class="hiddenlink" target="rightframe">service
+(<code>String, Map&lt;String, String&gt;</code>)</A></nobr><br>
+<i>setButton</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.app.AlertDialog.html#android.app.AlertDialog.setButton_changed(int, java.lang.CharSequence, android.content.DialogInterface.OnClickListener)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>int, CharSequence, OnClickListener</code>)&nbsp;in&nbsp;android.app.AlertDialog
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.app.AlertDialog.html#android.app.AlertDialog.setButton_changed(int, java.lang.CharSequence, android.os.Message)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>int, CharSequence, Message</code>)&nbsp;in&nbsp;android.app.AlertDialog
+</A></nobr><br>
+<i>setButton2</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.app.AlertDialog.html#android.app.AlertDialog.setButton2_changed(java.lang.CharSequence, android.content.DialogInterface.OnClickListener)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>CharSequence, OnClickListener</code>)&nbsp;in&nbsp;android.app.AlertDialog
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.app.AlertDialog.html#android.app.AlertDialog.setButton2_changed(java.lang.CharSequence, android.os.Message)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>CharSequence, Message</code>)&nbsp;in&nbsp;android.app.AlertDialog
+</A></nobr><br>
+<i>setButton3</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.app.AlertDialog.html#android.app.AlertDialog.setButton3_changed(java.lang.CharSequence, android.content.DialogInterface.OnClickListener)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>CharSequence, OnClickListener</code>)&nbsp;in&nbsp;android.app.AlertDialog
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.app.AlertDialog.html#android.app.AlertDialog.setButton3_changed(java.lang.CharSequence, android.os.Message)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>CharSequence, Message</code>)&nbsp;in&nbsp;android.app.AlertDialog
+</A></nobr><br>
+<nobr><A HREF="android.hardware.Camera.html#android.hardware.Camera.setPreviewDisplay_changed(android.view.SurfaceHolder)" class="hiddenlink" target="rightframe">setPreviewDisplay
+(<code>SurfaceHolder</code>)</A></nobr><br>
+<nobr><A HREF="android.webkit.WebSettings.html#android.webkit.WebSettings.setUserAgent_changed(int)" class="hiddenlink" target="rightframe">setUserAgent
+(<code>int</code>)</A></nobr><br>
+<A NAME="U"></A>
+<br><font size="+2">U</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<i>unregisterListener</i><br>
+&nbsp;&nbsp;<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.unregisterListener_changed(android.hardware.SensorListener)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>SensorListener</code>)&nbsp;in&nbsp;android.hardware.SensorManager
+</A></nobr><br>
+&nbsp;&nbsp;<nobr><A HREF="android.hardware.SensorManager.html#android.hardware.SensorManager.unregisterListener_changed(android.hardware.SensorListener, int)" class="hiddenlink" target="rightframe">type&nbsp;
+(<code>SensorListener, int</code>)&nbsp;in&nbsp;android.hardware.SensorManager
+</A></nobr><br>
+<A NAME="W"></A>
+<br><font size="+2">W</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#Y"><font size="-2">Y</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.os.Parcel.html#android.os.Parcel.writeMap_changed(java.util.Map)" class="hiddenlink" target="rightframe">writeMap
+(<code>Map</code>)</A></nobr><br>
+<A NAME="Y"></A>
+<br><font size="+2">Y</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<nobr><A HREF="android.database.sqlite.SQLiteDatabase.html#android.database.sqlite.SQLiteDatabase.yieldIfContended_changed()" class="hiddenlink" target="rightframe">yieldIfContended
+()</A></nobr><br>
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/methods_index_removals.html b/docs/html/sdk/api_diff/3/changes/methods_index_removals.html
new file mode 100644
index 000000000000..bbce14487297
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/methods_index_removals.html
@@ -0,0 +1,62 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+Method Removals Index
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY class="gc-documentation">
+<a NAME="topheader"></a>
+<table summary="Index for Methods" width="100%" class="jdiffIndex" border="0" cellspacing="0" cellpadding="0" style="padding-bottom:0;margin-bottom:0;">
+  <tr>
+  <th class="indexHeader">
+    Filter the Index:
+  </th>
+  </tr>
+  <tr>
+  <td class="indexText" style="line-height:1.3em;padding-left:2em;">
+<a href="methods_index_all.html" class="staysblack">All Methods</a>
+  <br>
+<font color="#999999">Removals</font>
+  <br>
+<A HREF="methods_index_additions.html"xclass="hiddenlink">Additions</A>
+  <br>
+<A HREF="methods_index_changes.html"xclass="hiddenlink">Changes</A>
+  </td>
+  </tr>
+</table>
+<div id="indexTableCaption">
+<font size="-2"><strong>Bold</strong>&nbsp;indicates&nbsp;New;&nbsp;<strike>Strike</strike>&nbsp;indicates&nbsp;deleted. Plain indicates changed.</font>
+</div>
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/packages_index_additions.html b/docs/html/sdk/api_diff/3/changes/packages_index_additions.html
new file mode 100644
index 000000000000..ccd54fdc5c76
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/packages_index_additions.html
@@ -0,0 +1,72 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+Package Additions Index
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY class="gc-documentation">
+<a NAME="topheader"></a>
+<table summary="Index for Packages" width="100%" class="jdiffIndex" border="0" cellspacing="0" cellpadding="0" style="padding-bottom:0;margin-bottom:0;">
+  <tr>
+  <th class="indexHeader">
+    Filter the Index:
+  </th>
+  </tr>
+  <tr>
+  <td class="indexText" style="line-height:1.3em;padding-left:2em;">
+<a href="packages_index_all.html" class="staysblack">All Packages</a>
+  <br>
+<font color="#999999">Removals</font>
+  <br>
+<b>Additions</b>
+  <br>
+<A HREF="packages_index_changes.html"xclass="hiddenlink">Changes</A>
+  </td>
+  </tr>
+</table>
+<div id="indexTableCaption">
+<font size="-2"><strong>Bold</strong>&nbsp;indicates&nbsp;New;&nbsp;<strike>Strike</strike>&nbsp;indicates&nbsp;deleted. Plain indicates changed.</font>
+</div>
+<br>
+<div id="indexTableEntries">
+<A NAME="A"></A>
+<A HREF="changes-summary.html#android.appwidget" class="hiddenlink" target="rightframe"><b>android.appwidget</b></A><br>
+<A HREF="changes-summary.html#android.inputmethodservice" class="hiddenlink" target="rightframe"><b>android.inputmethodservice</b></A><br>
+<A HREF="changes-summary.html#android.speech" class="hiddenlink" target="rightframe"><b>android.speech</b></A><br>
+<A HREF="changes-summary.html#android.text.format" class="hiddenlink" target="rightframe"><b>android.text.format</b></A><br>
+<A HREF="changes-summary.html#android.view.inputmethod" class="hiddenlink" target="rightframe"><b>android.view.inputmethod</b></A><br>
+<A NAME="J"></A>
+<A HREF="changes-summary.html#java.beans" class="hiddenlink" target="rightframe"><b>java.beans</b></A><br>
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/packages_index_all.html b/docs/html/sdk/api_diff/3/changes/packages_index_all.html
new file mode 100644
index 000000000000..5876fe92fca9
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/packages_index_all.html
@@ -0,0 +1,112 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+Package Differences Index
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY class="gc-documentation">
+<a NAME="topheader"></a>
+<table summary="Index for Packages" width="100%" class="jdiffIndex" border="0" cellspacing="0" cellpadding="0" style="padding-bottom:0;margin-bottom:0;">
+  <tr>
+  <th class="indexHeader">
+    Filter the Index:
+  </th>
+  </tr>
+  <tr>
+  <td class="indexText" style="line-height:1.3em;padding-left:2em;">
+<b>Packages</b>
+  <br>
+<font color="#999999">Removals</font>
+  <br>
+<A HREF="packages_index_additions.html"xclass="hiddenlink">Additions</A>
+  <br>
+<A HREF="packages_index_changes.html"xclass="hiddenlink">Changes</A>
+  </td>
+  </tr>
+</table>
+<div id="indexTableCaption">
+<font size="-2"><strong>Bold</strong>&nbsp;indicates&nbsp;New;&nbsp;<strike>Strike</strike>&nbsp;indicates&nbsp;deleted. Plain indicates changed.</font>
+</div>
+<br>
+<div id="indexTableEntries">
+<A NAME="A"></A>
+<A HREF="pkg_android.html" class="hiddenlink" target="rightframe">android</A><br>
+<A HREF="pkg_android.app.html" class="hiddenlink" target="rightframe">android.app</A><br>
+<A HREF="changes-summary.html#android.appwidget" class="hiddenlink" target="rightframe"><b>android.appwidget</b></A><br>
+<A HREF="pkg_android.content.html" class="hiddenlink" target="rightframe">android.content</A><br>
+<A HREF="pkg_android.content.pm.html" class="hiddenlink" target="rightframe">android.content.pm</A><br>
+<A HREF="pkg_android.content.res.html" class="hiddenlink" target="rightframe">android.content.res</A><br>
+<A HREF="pkg_android.database.html" class="hiddenlink" target="rightframe">android.database</A><br>
+<A HREF="pkg_android.database.sqlite.html" class="hiddenlink" target="rightframe">android.database.sqlite</A><br>
+<A HREF="pkg_android.graphics.html" class="hiddenlink" target="rightframe">android.graphics</A><br>
+<A HREF="pkg_android.graphics.drawable.html" class="hiddenlink" target="rightframe">android.graphics.drawable</A><br>
+<A HREF="pkg_android.graphics.drawable.shapes.html" class="hiddenlink" target="rightframe">android.graphics.drawable.shapes</A><br>
+<A HREF="pkg_android.hardware.html" class="hiddenlink" target="rightframe">android.hardware</A><br>
+<A HREF="changes-summary.html#android.inputmethodservice" class="hiddenlink" target="rightframe"><b>android.inputmethodservice</b></A><br>
+<A HREF="pkg_android.location.html" class="hiddenlink" target="rightframe">android.location</A><br>
+<A HREF="pkg_android.media.html" class="hiddenlink" target="rightframe">android.media</A><br>
+<A HREF="pkg_android.net.html" class="hiddenlink" target="rightframe">android.net</A><br>
+<A HREF="pkg_android.net.wifi.html" class="hiddenlink" target="rightframe">android.net.wifi</A><br>
+<A HREF="pkg_android.opengl.html" class="hiddenlink" target="rightframe">android.opengl</A><br>
+<A HREF="pkg_android.os.html" class="hiddenlink" target="rightframe">android.os</A><br>
+<A HREF="pkg_android.preference.html" class="hiddenlink" target="rightframe">android.preference</A><br>
+<A HREF="pkg_android.provider.html" class="hiddenlink" target="rightframe">android.provider</A><br>
+<A HREF="changes-summary.html#android.speech" class="hiddenlink" target="rightframe"><b>android.speech</b></A><br>
+<A HREF="pkg_android.telephony.html" class="hiddenlink" target="rightframe">android.telephony</A><br>
+<A HREF="pkg_android.telephony.gsm.html" class="hiddenlink" target="rightframe">android.telephony.gsm</A><br>
+<A HREF="pkg_android.test.html" class="hiddenlink" target="rightframe">android.test</A><br>
+<A HREF="pkg_android.test.mock.html" class="hiddenlink" target="rightframe">android.test.mock</A><br>
+<A HREF="pkg_android.test.suitebuilder.html" class="hiddenlink" target="rightframe">android.test.suitebuilder</A><br>
+<A HREF="pkg_android.text.html" class="hiddenlink" target="rightframe">android.text</A><br>
+<A HREF="changes-summary.html#android.text.format" class="hiddenlink" target="rightframe"><b>android.text.format</b></A><br>
+<A HREF="pkg_android.text.method.html" class="hiddenlink" target="rightframe">android.text.method</A><br>
+<A HREF="pkg_android.text.style.html" class="hiddenlink" target="rightframe">android.text.style</A><br>
+<A HREF="pkg_android.util.html" class="hiddenlink" target="rightframe">android.util</A><br>
+<A HREF="pkg_android.view.html" class="hiddenlink" target="rightframe">android.view</A><br>
+<A HREF="pkg_android.view.animation.html" class="hiddenlink" target="rightframe">android.view.animation</A><br>
+<A HREF="changes-summary.html#android.view.inputmethod" class="hiddenlink" target="rightframe"><b>android.view.inputmethod</b></A><br>
+<A HREF="pkg_android.webkit.html" class="hiddenlink" target="rightframe">android.webkit</A><br>
+<A HREF="pkg_android.widget.html" class="hiddenlink" target="rightframe">android.widget</A><br>
+<A NAME="D"></A>
+<A HREF="pkg_dalvik.system.html" class="hiddenlink" target="rightframe">dalvik.system</A><br>
+<A NAME="J"></A>
+<A HREF="changes-summary.html#java.beans" class="hiddenlink" target="rightframe"><b>java.beans</b></A><br>
+<A HREF="pkg_java.lang.html" class="hiddenlink" target="rightframe">java.lang</A><br>
+<A HREF="pkg_java.lang.reflect.html" class="hiddenlink" target="rightframe">java.lang.reflect</A><br>
+<A HREF="pkg_java.net.html" class="hiddenlink" target="rightframe">java.net</A><br>
+<A HREF="pkg_java.util.html" class="hiddenlink" target="rightframe">java.util</A><br>
+<A HREF="pkg_java.util.jar.html" class="hiddenlink" target="rightframe">java.util.jar</A><br>
+<A HREF="pkg_java.util.logging.html" class="hiddenlink" target="rightframe">java.util.logging</A><br>
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/packages_index_changes.html b/docs/html/sdk/api_diff/3/changes/packages_index_changes.html
new file mode 100644
index 000000000000..3665a918f31f
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/packages_index_changes.html
@@ -0,0 +1,106 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+Package Changes Index
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY class="gc-documentation">
+<a NAME="topheader"></a>
+<table summary="Index for Packages" width="100%" class="jdiffIndex" border="0" cellspacing="0" cellpadding="0" style="padding-bottom:0;margin-bottom:0;">
+  <tr>
+  <th class="indexHeader">
+    Filter the Index:
+  </th>
+  </tr>
+  <tr>
+  <td class="indexText" style="line-height:1.3em;padding-left:2em;">
+<a href="packages_index_all.html" class="staysblack">All Packages</a>
+  <br>
+<font color="#999999">Removals</font>
+  <br>
+<A HREF="packages_index_additions.html"xclass="hiddenlink">Additions</A>
+  <br>
+<b>Changes</b>
+  </td>
+  </tr>
+</table>
+<div id="indexTableCaption">
+<font size="-2"><strong>Bold</strong>&nbsp;indicates&nbsp;New;&nbsp;<strike>Strike</strike>&nbsp;indicates&nbsp;deleted. Plain indicates changed.</font>
+</div>
+<br>
+<div id="indexTableEntries">
+<A NAME="A"></A>
+<A HREF="pkg_android.html" class="hiddenlink" target="rightframe">android</A><br>
+<A HREF="pkg_android.app.html" class="hiddenlink" target="rightframe">android.app</A><br>
+<A HREF="pkg_android.content.html" class="hiddenlink" target="rightframe">android.content</A><br>
+<A HREF="pkg_android.content.pm.html" class="hiddenlink" target="rightframe">android.content.pm</A><br>
+<A HREF="pkg_android.content.res.html" class="hiddenlink" target="rightframe">android.content.res</A><br>
+<A HREF="pkg_android.database.html" class="hiddenlink" target="rightframe">android.database</A><br>
+<A HREF="pkg_android.database.sqlite.html" class="hiddenlink" target="rightframe">android.database.sqlite</A><br>
+<A HREF="pkg_android.graphics.html" class="hiddenlink" target="rightframe">android.graphics</A><br>
+<A HREF="pkg_android.graphics.drawable.html" class="hiddenlink" target="rightframe">android.graphics.drawable</A><br>
+<A HREF="pkg_android.graphics.drawable.shapes.html" class="hiddenlink" target="rightframe">android.graphics.drawable.shapes</A><br>
+<A HREF="pkg_android.hardware.html" class="hiddenlink" target="rightframe">android.hardware</A><br>
+<A HREF="pkg_android.location.html" class="hiddenlink" target="rightframe">android.location</A><br>
+<A HREF="pkg_android.media.html" class="hiddenlink" target="rightframe">android.media</A><br>
+<A HREF="pkg_android.net.html" class="hiddenlink" target="rightframe">android.net</A><br>
+<A HREF="pkg_android.net.wifi.html" class="hiddenlink" target="rightframe">android.net.wifi</A><br>
+<A HREF="pkg_android.opengl.html" class="hiddenlink" target="rightframe">android.opengl</A><br>
+<A HREF="pkg_android.os.html" class="hiddenlink" target="rightframe">android.os</A><br>
+<A HREF="pkg_android.preference.html" class="hiddenlink" target="rightframe">android.preference</A><br>
+<A HREF="pkg_android.provider.html" class="hiddenlink" target="rightframe">android.provider</A><br>
+<A HREF="pkg_android.telephony.html" class="hiddenlink" target="rightframe">android.telephony</A><br>
+<A HREF="pkg_android.telephony.gsm.html" class="hiddenlink" target="rightframe">android.telephony.gsm</A><br>
+<A HREF="pkg_android.test.html" class="hiddenlink" target="rightframe">android.test</A><br>
+<A HREF="pkg_android.test.mock.html" class="hiddenlink" target="rightframe">android.test.mock</A><br>
+<A HREF="pkg_android.test.suitebuilder.html" class="hiddenlink" target="rightframe">android.test.suitebuilder</A><br>
+<A HREF="pkg_android.text.html" class="hiddenlink" target="rightframe">android.text</A><br>
+<A HREF="pkg_android.text.method.html" class="hiddenlink" target="rightframe">android.text.method</A><br>
+<A HREF="pkg_android.text.style.html" class="hiddenlink" target="rightframe">android.text.style</A><br>
+<A HREF="pkg_android.util.html" class="hiddenlink" target="rightframe">android.util</A><br>
+<A HREF="pkg_android.view.html" class="hiddenlink" target="rightframe">android.view</A><br>
+<A HREF="pkg_android.view.animation.html" class="hiddenlink" target="rightframe">android.view.animation</A><br>
+<A HREF="pkg_android.webkit.html" class="hiddenlink" target="rightframe">android.webkit</A><br>
+<A HREF="pkg_android.widget.html" class="hiddenlink" target="rightframe">android.widget</A><br>
+<A NAME="D"></A>
+<A HREF="pkg_dalvik.system.html" class="hiddenlink" target="rightframe">dalvik.system</A><br>
+<A NAME="J"></A>
+<A HREF="pkg_java.lang.html" class="hiddenlink" target="rightframe">java.lang</A><br>
+<A HREF="pkg_java.lang.reflect.html" class="hiddenlink" target="rightframe">java.lang.reflect</A><br>
+<A HREF="pkg_java.net.html" class="hiddenlink" target="rightframe">java.net</A><br>
+<A HREF="pkg_java.util.html" class="hiddenlink" target="rightframe">java.util</A><br>
+<A HREF="pkg_java.util.jar.html" class="hiddenlink" target="rightframe">java.util.jar</A><br>
+<A HREF="pkg_java.util.logging.html" class="hiddenlink" target="rightframe">java.util.logging</A><br>
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/packages_index_removals.html b/docs/html/sdk/api_diff/3/changes/packages_index_removals.html
new file mode 100644
index 000000000000..17a90d9989ca
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/packages_index_removals.html
@@ -0,0 +1,64 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+Package Removals Index
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY class="gc-documentation">
+<a NAME="topheader"></a>
+<table summary="Index for Packages" width="100%" class="jdiffIndex" border="0" cellspacing="0" cellpadding="0" style="padding-bottom:0;margin-bottom:0;">
+  <tr>
+  <th class="indexHeader">
+    Filter the Index:
+  </th>
+  </tr>
+  <tr>
+  <td class="indexText" style="line-height:1.3em;padding-left:2em;">
+<a href="packages_index_all.html" class="staysblack">All Packages</a>
+  <br>
+<font color="#999999">Removals</font>
+  <br>
+<A HREF="packages_index_additions.html"xclass="hiddenlink">Additions</A>
+  <br>
+<A HREF="packages_index_changes.html"xclass="hiddenlink">Changes</A>
+  </td>
+  </tr>
+</table>
+<div id="indexTableCaption">
+<font size="-2"><strong>Bold</strong>&nbsp;indicates&nbsp;New;&nbsp;<strike>Strike</strike>&nbsp;indicates&nbsp;deleted. Plain indicates changed.</font>
+</div>
+<br>
+<div id="indexTableEntries">
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/pkg_android.app.html b/docs/html/sdk/api_diff/3/changes/pkg_android.app.html
new file mode 100644
index 000000000000..c1602d80f1a3
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/pkg_android.app.html
@@ -0,0 +1,198 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.app
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Package <A HREF="../../../../reference/android/app/package-summary.html" target="_top"><font size="+1"><tt>android.app</tt></font></A>
+</H2>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Classes" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Classes</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="ActivityManager.RunningAppProcessInfo"></A>
+  <nobr><A HREF="../../../../reference/android/app/ActivityManager.RunningAppProcessInfo.html" target="_top"><xfont size="+1"><tt>ActivityManager.RunningAppProcessInfo</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="IntentService"></A>
+  <nobr><A HREF="../../../../reference/android/app/IntentService.html" target="_top"><xfont size="+1"><tt>IntentService</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="LauncherActivity.IconResizer"></A>
+  <nobr><A HREF="../../../../reference/android/app/LauncherActivity.IconResizer.html" target="_top"><xfont size="+1"><tt>LauncherActivity.IconResizer</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="LauncherActivity.ListItem"></A>
+  <nobr><A HREF="../../../../reference/android/app/LauncherActivity.ListItem.html" target="_top"><xfont size="+1"><tt>LauncherActivity.ListItem</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Classes" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Changed Classes</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="Activity"></A>
+  <nobr><A HREF="android.app.Activity.html">Activity</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="ActivityManager"></A>
+  <nobr><A HREF="android.app.ActivityManager.html">ActivityManager</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="AlarmManager"></A>
+  <nobr><A HREF="android.app.AlarmManager.html">AlarmManager</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="AlertDialog"></A>
+  <nobr><A HREF="android.app.AlertDialog.html">AlertDialog</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="Instrumentation"></A>
+  <nobr><A HREF="android.app.Instrumentation.html">Instrumentation</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="LauncherActivity"></A>
+  <nobr><A HREF="android.app.LauncherActivity.html">LauncherActivity</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="PendingIntent"></A>
+  <nobr><A HREF="android.app.PendingIntent.html">PendingIntent</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/pkg_android.content.html b/docs/html/sdk/api_diff/3/changes/pkg_android.content.html
new file mode 100644
index 000000000000..8a9f4af0a243
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/pkg_android.content.html
@@ -0,0 +1,155 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.content
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Package <A HREF="../../../../reference/android/content/package-summary.html" target="_top"><font size="+1"><tt>android.content</tt></font></A>
+</H2>
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Classes and Interfaces" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Changed Classes and Interfaces</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="BroadcastReceiver"></A>
+  <nobr><A HREF="android.content.BroadcastReceiver.html">BroadcastReceiver</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="ContentProvider"></A>
+  <nobr><A HREF="android.content.ContentProvider.html">ContentProvider</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="ContentResolver"></A>
+  <nobr><A HREF="android.content.ContentResolver.html">ContentResolver</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="Context"></A>
+  <nobr><A HREF="android.content.Context.html">Context</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="DialogInterface"></A>
+  <nobr><A HREF="android.content.DialogInterface.html"><I>DialogInterface</I></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="Intent"></A>
+  <nobr><A HREF="android.content.Intent.html">Intent</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/pkg_android.content.pm.html b/docs/html/sdk/api_diff/3/changes/pkg_android.content.pm.html
new file mode 100644
index 000000000000..d3bddd4badc3
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/pkg_android.content.pm.html
@@ -0,0 +1,149 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.content.pm
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Package <A HREF="../../../../reference/android/content/pm/package-summary.html" target="_top"><font size="+1"><tt>android.content.pm</tt></font></A>
+</H2>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Classes" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Classes</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="ConfigurationInfo"></A>
+  <nobr><A HREF="../../../../reference/android/content/pm/ConfigurationInfo.html" target="_top"><xfont size="+1"><tt>ConfigurationInfo</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Classes" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Changed Classes</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="ActivityInfo"></A>
+  <nobr><A HREF="android.content.pm.ActivityInfo.html">ActivityInfo</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="PackageInfo"></A>
+  <nobr><A HREF="android.content.pm.PackageInfo.html">PackageInfo</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="PackageManager"></A>
+  <nobr><A HREF="android.content.pm.PackageManager.html">PackageManager</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/pkg_android.content.res.html b/docs/html/sdk/api_diff/3/changes/pkg_android.content.res.html
new file mode 100644
index 000000000000..81d234d2263c
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/pkg_android.content.res.html
@@ -0,0 +1,163 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.content.res
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Package <A HREF="../../../../reference/android/content/res/package-summary.html" target="_top"><font size="+1"><tt>android.content.res</tt></font></A>
+</H2>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Classes" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Classes</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="AssetFileDescriptor.AutoCloseInputStream"></A>
+  <nobr><A HREF="../../../../reference/android/content/res/AssetFileDescriptor.AutoCloseInputStream.html" target="_top"><xfont size="+1"><tt>AssetFileDescriptor.AutoCloseInputStream</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="AssetFileDescriptor.AutoCloseOutputStream"></A>
+  <nobr><A HREF="../../../../reference/android/content/res/AssetFileDescriptor.AutoCloseOutputStream.html" target="_top"><xfont size="+1"><tt>AssetFileDescriptor.AutoCloseOutputStream</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Classes" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Changed Classes</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="AssetFileDescriptor"></A>
+  <nobr><A HREF="android.content.res.AssetFileDescriptor.html">AssetFileDescriptor</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="Configuration"></A>
+  <nobr><A HREF="android.content.res.Configuration.html">Configuration</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="Resources"></A>
+  <nobr><A HREF="android.content.res.Resources.html">Resources</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="TypedArray"></A>
+  <nobr><A HREF="android.content.res.TypedArray.html">TypedArray</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/pkg_android.database.html b/docs/html/sdk/api_diff/3/changes/pkg_android.database.html
new file mode 100644
index 000000000000..70b964445d55
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/pkg_android.database.html
@@ -0,0 +1,134 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.database
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Package <A HREF="../../../../reference/android/database/package-summary.html" target="_top"><font size="+1"><tt>android.database</tt></font></A>
+</H2>
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Classes and Interfaces" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Changed Classes and Interfaces</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="Cursor"></A>
+  <nobr><A HREF="android.database.Cursor.html"><I>Cursor</I></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="CursorWrapper"></A>
+  <nobr><A HREF="android.database.CursorWrapper.html">CursorWrapper</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="DatabaseUtils"></A>
+  <nobr><A HREF="android.database.DatabaseUtils.html">DatabaseUtils</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/pkg_android.database.sqlite.html b/docs/html/sdk/api_diff/3/changes/pkg_android.database.sqlite.html
new file mode 100644
index 000000000000..db2017bbdc9b
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/pkg_android.database.sqlite.html
@@ -0,0 +1,120 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.database.sqlite
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Package <A HREF="../../../../reference/android/database/sqlite/package-summary.html" target="_top"><font size="+1"><tt>android.database.sqlite</tt></font></A>
+</H2>
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Classes" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Changed Classes</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="SQLiteDatabase"></A>
+  <nobr><A HREF="android.database.sqlite.SQLiteDatabase.html">SQLiteDatabase</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/pkg_android.graphics.drawable.html b/docs/html/sdk/api_diff/3/changes/pkg_android.graphics.drawable.html
new file mode 100644
index 000000000000..6025b71b03d8
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/pkg_android.graphics.drawable.html
@@ -0,0 +1,141 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.graphics.drawable
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Package <A HREF="../../../../reference/android/graphics/drawable/package-summary.html" target="_top"><font size="+1"><tt>android.graphics.drawable</tt></font></A>
+</H2>
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Classes" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Changed Classes</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="Drawable"></A>
+  <nobr><A HREF="android.graphics.drawable.Drawable.html">Drawable</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="RotateDrawable"></A>
+  <nobr><A HREF="android.graphics.drawable.RotateDrawable.html">RotateDrawable</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="ScaleDrawable"></A>
+  <nobr><A HREF="android.graphics.drawable.ScaleDrawable.html">ScaleDrawable</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="TransitionDrawable"></A>
+  <nobr><A HREF="android.graphics.drawable.TransitionDrawable.html">TransitionDrawable</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/pkg_android.graphics.drawable.shapes.html b/docs/html/sdk/api_diff/3/changes/pkg_android.graphics.drawable.shapes.html
new file mode 100644
index 000000000000..affdaabc6321
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/pkg_android.graphics.drawable.shapes.html
@@ -0,0 +1,120 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.graphics.drawable.shapes
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Package <A HREF="../../../../reference/android/graphics/drawable/shapes/package-summary.html" target="_top"><font size="+1"><tt>android.graphics.drawable.shapes</tt></font></A>
+</H2>
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Classes" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Changed Classes</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="Shape"></A>
+  <nobr><A HREF="android.graphics.drawable.shapes.Shape.html">Shape</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/pkg_android.graphics.html b/docs/html/sdk/api_diff/3/changes/pkg_android.graphics.html
new file mode 100644
index 000000000000..c7644d5860bd
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/pkg_android.graphics.html
@@ -0,0 +1,141 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.graphics
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Package <A HREF="../../../../reference/android/graphics/package-summary.html" target="_top"><font size="+1"><tt>android.graphics</tt></font></A>
+</H2>
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Classes" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Changed Classes</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="Bitmap"></A>
+  <nobr><A HREF="android.graphics.Bitmap.html">Bitmap</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="Canvas"></A>
+  <nobr><A HREF="android.graphics.Canvas.html">Canvas</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="Rect"></A>
+  <nobr><A HREF="android.graphics.Rect.html">Rect</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="RectF"></A>
+  <nobr><A HREF="android.graphics.RectF.html">RectF</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/pkg_android.hardware.html b/docs/html/sdk/api_diff/3/changes/pkg_android.hardware.html
new file mode 100644
index 000000000000..63ebbdc19f69
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/pkg_android.hardware.html
@@ -0,0 +1,170 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.hardware
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Package <A HREF="../../../../reference/android/hardware/package-summary.html" target="_top"><font size="+1"><tt>android.hardware</tt></font></A>
+</H2>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Classes and Interfaces" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Classes and Interfaces</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="GeomagneticField"></A>
+  <nobr><A HREF="../../../../reference/android/hardware/GeomagneticField.html" target="_top"><xfont size="+1"><tt>GeomagneticField</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="Sensor"></A>
+  <nobr><A HREF="../../../../reference/android/hardware/Sensor.html" target="_top"><xfont size="+1"><tt>Sensor</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="SensorEvent"></A>
+  <nobr><A HREF="../../../../reference/android/hardware/SensorEvent.html" target="_top"><xfont size="+1"><tt>SensorEvent</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="SensorEventListener"></A>
+  <nobr><A HREF="../../../../reference/android/hardware/SensorEventListener.html" target="_top"><xfont size="+1"><tt><I>SensorEventListener</I></tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Classes and Interfaces" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Changed Classes and Interfaces</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="Camera"></A>
+  <nobr><A HREF="android.hardware.Camera.html">Camera</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="SensorListener"></A>
+  <nobr><A HREF="android.hardware.SensorListener.html"><I>SensorListener</I></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="SensorManager"></A>
+  <nobr><A HREF="android.hardware.SensorManager.html">SensorManager</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/pkg_android.html b/docs/html/sdk/api_diff/3/changes/pkg_android.html
new file mode 100644
index 000000000000..0cedd98cb86e
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/pkg_android.html
@@ -0,0 +1,177 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Package <A HREF="../../../../reference/android/package-summary.html" target="_top"><font size="+1"><tt>android</tt></font></A>
+</H2>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Classes" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Classes</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="R.bool"></A>
+  <nobr><A HREF="../../../../reference/android/R.bool.html" target="_top"><xfont size="+1"><tt>R.bool</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="R.integer"></A>
+  <nobr><A HREF="../../../../reference/android/R.integer.html" target="_top"><xfont size="+1"><tt>R.integer</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Classes" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Changed Classes</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="Manifest.permission"></A>
+  <nobr><A HREF="android.Manifest.permission.html">Manifest.permission</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="R.attr"></A>
+  <nobr><A HREF="android.R.attr.html">R.attr</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="R.drawable"></A>
+  <nobr><A HREF="android.R.drawable.html">R.drawable</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="R.id"></A>
+  <nobr><A HREF="android.R.id.html">R.id</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="R.string"></A>
+  <nobr><A HREF="android.R.string.html">R.string</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="R.style"></A>
+  <nobr><A HREF="android.R.style.html">R.style</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/pkg_android.location.html b/docs/html/sdk/api_diff/3/changes/pkg_android.location.html
new file mode 100644
index 000000000000..2f8af381b95d
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/pkg_android.location.html
@@ -0,0 +1,156 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.location
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Package <A HREF="../../../../reference/android/location/package-summary.html" target="_top"><font size="+1"><tt>android.location</tt></font></A>
+</H2>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Classes and Interfaces" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Classes and Interfaces</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="GpsSatellite"></A>
+  <nobr><A HREF="../../../../reference/android/location/GpsSatellite.html" target="_top"><xfont size="+1"><tt>GpsSatellite</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="GpsStatus"></A>
+  <nobr><A HREF="../../../../reference/android/location/GpsStatus.html" target="_top"><xfont size="+1"><tt>GpsStatus</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="GpsStatus.Listener"></A>
+  <nobr><A HREF="../../../../reference/android/location/GpsStatus.Listener.html" target="_top"><xfont size="+1"><tt><I>GpsStatus.Listener</I></tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Classes" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Changed Classes</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="Location"></A>
+  <nobr><A HREF="android.location.Location.html">Location</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="LocationManager"></A>
+  <nobr><A HREF="android.location.LocationManager.html">LocationManager</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/pkg_android.media.html b/docs/html/sdk/api_diff/3/changes/pkg_android.media.html
new file mode 100644
index 000000000000..c531240beb8d
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/pkg_android.media.html
@@ -0,0 +1,254 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.media
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Package <A HREF="../../../../reference/android/media/package-summary.html" target="_top"><font size="+1"><tt>android.media</tt></font></A>
+</H2>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Classes and Interfaces" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Classes and Interfaces</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="AudioFormat"></A>
+  <nobr><A HREF="../../../../reference/android/media/AudioFormat.html" target="_top"><xfont size="+1"><tt>AudioFormat</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="AudioRecord"></A>
+  <nobr><A HREF="../../../../reference/android/media/AudioRecord.html" target="_top"><xfont size="+1"><tt>AudioRecord</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="AudioRecord.OnRecordPositionUpdateListener"></A>
+  <nobr><A HREF="../../../../reference/android/media/AudioRecord.OnRecordPositionUpdateListener.html" target="_top"><xfont size="+1"><tt><I>AudioRecord.OnRecordPositionUpdateListener</I></tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="AudioTrack"></A>
+  <nobr><A HREF="../../../../reference/android/media/AudioTrack.html" target="_top"><xfont size="+1"><tt>AudioTrack</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="AudioTrack.OnPlaybackPositionUpdateListener"></A>
+  <nobr><A HREF="../../../../reference/android/media/AudioTrack.OnPlaybackPositionUpdateListener.html" target="_top"><xfont size="+1"><tt><I>AudioTrack.OnPlaybackPositionUpdateListener</I></tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="JetPlayer"></A>
+  <nobr><A HREF="../../../../reference/android/media/JetPlayer.html" target="_top"><xfont size="+1"><tt>JetPlayer</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="JetPlayer.OnJetEventListener"></A>
+  <nobr><A HREF="../../../../reference/android/media/JetPlayer.OnJetEventListener.html" target="_top"><xfont size="+1"><tt><I>JetPlayer.OnJetEventListener</I></tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="MediaPlayer.OnInfoListener"></A>
+  <nobr><A HREF="../../../../reference/android/media/MediaPlayer.OnInfoListener.html" target="_top"><xfont size="+1"><tt><I>MediaPlayer.OnInfoListener</I></tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="MediaPlayer.OnVideoSizeChangedListener"></A>
+  <nobr><A HREF="../../../../reference/android/media/MediaPlayer.OnVideoSizeChangedListener.html" target="_top"><xfont size="+1"><tt><I>MediaPlayer.OnVideoSizeChangedListener</I></tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="MediaRecorder.OnErrorListener"></A>
+  <nobr><A HREF="../../../../reference/android/media/MediaRecorder.OnErrorListener.html" target="_top"><xfont size="+1"><tt><I>MediaRecorder.OnErrorListener</I></tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="MediaRecorder.OnInfoListener"></A>
+  <nobr><A HREF="../../../../reference/android/media/MediaRecorder.OnInfoListener.html" target="_top"><xfont size="+1"><tt><I>MediaRecorder.OnInfoListener</I></tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="MediaRecorder.VideoEncoder"></A>
+  <nobr><A HREF="../../../../reference/android/media/MediaRecorder.VideoEncoder.html" target="_top"><xfont size="+1"><tt>MediaRecorder.VideoEncoder</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="MediaRecorder.VideoSource"></A>
+  <nobr><A HREF="../../../../reference/android/media/MediaRecorder.VideoSource.html" target="_top"><xfont size="+1"><tt>MediaRecorder.VideoSource</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Classes" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Changed Classes</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="AudioManager"></A>
+  <nobr><A HREF="android.media.AudioManager.html">AudioManager</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="MediaPlayer"></A>
+  <nobr><A HREF="android.media.MediaPlayer.html">MediaPlayer</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="MediaRecorder"></A>
+  <nobr><A HREF="android.media.MediaRecorder.html">MediaRecorder</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="MediaRecorder.OutputFormat"></A>
+  <nobr><A HREF="android.media.MediaRecorder.OutputFormat.html">MediaRecorder.OutputFormat</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="RingtoneManager"></A>
+  <nobr><A HREF="android.media.RingtoneManager.html">RingtoneManager</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="SoundPool"></A>
+  <nobr><A HREF="android.media.SoundPool.html">SoundPool</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/pkg_android.net.html b/docs/html/sdk/api_diff/3/changes/pkg_android.net.html
new file mode 100644
index 000000000000..cf2f916cede7
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/pkg_android.net.html
@@ -0,0 +1,127 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.net
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Package <A HREF="../../../../reference/android/net/package-summary.html" target="_top"><font size="+1"><tt>android.net</tt></font></A>
+</H2>
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Classes" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Changed Classes</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="ConnectivityManager"></A>
+  <nobr><A HREF="android.net.ConnectivityManager.html">ConnectivityManager</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="NetworkInfo"></A>
+  <nobr><A HREF="android.net.NetworkInfo.html">NetworkInfo</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/pkg_android.net.wifi.html b/docs/html/sdk/api_diff/3/changes/pkg_android.net.wifi.html
new file mode 100644
index 000000000000..99f2951d1f78
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/pkg_android.net.wifi.html
@@ -0,0 +1,120 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.net.wifi
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Package <A HREF="../../../../reference/android/net/wifi/package-summary.html" target="_top"><font size="+1"><tt>android.net.wifi</tt></font></A>
+</H2>
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Classes" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Changed Classes</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="WifiManager"></A>
+  <nobr><A HREF="android.net.wifi.WifiManager.html">WifiManager</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/pkg_android.opengl.html b/docs/html/sdk/api_diff/3/changes/pkg_android.opengl.html
new file mode 100644
index 000000000000..622d8612fb97
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/pkg_android.opengl.html
@@ -0,0 +1,148 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.opengl
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Package <A HREF="../../../../reference/android/opengl/package-summary.html" target="_top"><font size="+1"><tt>android.opengl</tt></font></A>
+</H2>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Classes and Interfaces" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Classes and Interfaces</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="GLSurfaceView"></A>
+  <nobr><A HREF="../../../../reference/android/opengl/GLSurfaceView.html" target="_top"><xfont size="+1"><tt>GLSurfaceView</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="GLSurfaceView.EGLConfigChooser"></A>
+  <nobr><A HREF="../../../../reference/android/opengl/GLSurfaceView.EGLConfigChooser.html" target="_top"><xfont size="+1"><tt><I>GLSurfaceView.EGLConfigChooser</I></tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="GLSurfaceView.GLWrapper"></A>
+  <nobr><A HREF="../../../../reference/android/opengl/GLSurfaceView.GLWrapper.html" target="_top"><xfont size="+1"><tt><I>GLSurfaceView.GLWrapper</I></tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="GLSurfaceView.Renderer"></A>
+  <nobr><A HREF="../../../../reference/android/opengl/GLSurfaceView.Renderer.html" target="_top"><xfont size="+1"><tt><I>GLSurfaceView.Renderer</I></tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="Visibility"></A>
+  <nobr><A HREF="../../../../reference/android/opengl/Visibility.html" target="_top"><xfont size="+1"><tt>Visibility</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/pkg_android.os.html b/docs/html/sdk/api_diff/3/changes/pkg_android.os.html
new file mode 100644
index 000000000000..098864ef879d
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/pkg_android.os.html
@@ -0,0 +1,212 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.os
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Package <A HREF="../../../../reference/android/os/package-summary.html" target="_top"><font size="+1"><tt>android.os</tt></font></A>
+</H2>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Classes and Interfaces" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Classes and Interfaces</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="AsyncTask"></A>
+  <nobr><A HREF="../../../../reference/android/os/AsyncTask.html" target="_top"><xfont size="+1"><tt>AsyncTask</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="AsyncTask.Status"></A>
+  <nobr><A HREF="../../../../reference/android/os/AsyncTask.Status.html" target="_top"><xfont size="+1"><tt>AsyncTask.Status</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="Handler.Callback"></A>
+  <nobr><A HREF="../../../../reference/android/os/Handler.Callback.html" target="_top"><xfont size="+1"><tt><I>Handler.Callback</I></tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="ResultReceiver"></A>
+  <nobr><A HREF="../../../../reference/android/os/ResultReceiver.html" target="_top"><xfont size="+1"><tt>ResultReceiver</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Classes and Interfaces" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Changed Classes and Interfaces</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="Binder"></A>
+  <nobr><A HREF="android.os.Binder.html">Binder</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="Build"></A>
+  <nobr><A HREF="android.os.Build.html">Build</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="Debug"></A>
+  <nobr><A HREF="android.os.Debug.html">Debug</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="Environment"></A>
+  <nobr><A HREF="android.os.Environment.html">Environment</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="Handler"></A>
+  <nobr><A HREF="android.os.Handler.html">Handler</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="IBinder"></A>
+  <nobr><A HREF="android.os.IBinder.html"><I>IBinder</I></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="Looper"></A>
+  <nobr><A HREF="android.os.Looper.html">Looper</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="Parcel"></A>
+  <nobr><A HREF="android.os.Parcel.html">Parcel</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="ParcelFileDescriptor"></A>
+  <nobr><A HREF="android.os.ParcelFileDescriptor.html">ParcelFileDescriptor</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/pkg_android.preference.html b/docs/html/sdk/api_diff/3/changes/pkg_android.preference.html
new file mode 100644
index 000000000000..5ffe3cb61f34
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/pkg_android.preference.html
@@ -0,0 +1,120 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.preference
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Package <A HREF="../../../../reference/android/preference/package-summary.html" target="_top"><font size="+1"><tt>android.preference</tt></font></A>
+</H2>
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Classes" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Changed Classes</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="DialogPreference"></A>
+  <nobr><A HREF="android.preference.DialogPreference.html">DialogPreference</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/pkg_android.provider.html b/docs/html/sdk/api_diff/3/changes/pkg_android.provider.html
new file mode 100644
index 000000000000..f16e4fd19767
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/pkg_android.provider.html
@@ -0,0 +1,233 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.provider
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Package <A HREF="../../../../reference/android/provider/package-summary.html" target="_top"><font size="+1"><tt>android.provider</tt></font></A>
+</H2>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Classes" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Classes</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="LiveFolders"></A>
+  <nobr><A HREF="../../../../reference/android/provider/LiveFolders.html" target="_top"><xfont size="+1"><tt>LiveFolders</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="Settings.Secure"></A>
+  <nobr><A HREF="../../../../reference/android/provider/Settings.Secure.html" target="_top"><xfont size="+1"><tt>Settings.Secure</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="UserDictionary"></A>
+  <nobr><A HREF="../../../../reference/android/provider/UserDictionary.html" target="_top"><xfont size="+1"><tt>UserDictionary</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="UserDictionary.Words"></A>
+  <nobr><A HREF="../../../../reference/android/provider/UserDictionary.Words.html" target="_top"><xfont size="+1"><tt>UserDictionary.Words</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Classes and Interfaces" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Changed Classes and Interfaces</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="Browser"></A>
+  <nobr><A HREF="android.provider.Browser.html">Browser</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="Contacts.Intents"></A>
+  <nobr><A HREF="android.provider.Contacts.Intents.html">Contacts.Intents</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="Contacts.Intents.Insert"></A>
+  <nobr><A HREF="android.provider.Contacts.Intents.Insert.html">Contacts.Intents.Insert</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="Contacts.PeopleColumns"></A>
+  <nobr><A HREF="android.provider.Contacts.PeopleColumns.html"><I>Contacts.PeopleColumns</I></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="MediaStore"></A>
+  <nobr><A HREF="android.provider.MediaStore.html">MediaStore</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="MediaStore.Audio.AlbumColumns"></A>
+  <nobr><A HREF="android.provider.MediaStore.Audio.AlbumColumns.html"><I>MediaStore.Audio.AlbumColumns</I></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="MediaStore.Audio.Media"></A>
+  <nobr><A HREF="android.provider.MediaStore.Audio.Media.html">MediaStore.Audio.Media</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="MediaStore.Images.Media"></A>
+  <nobr><A HREF="android.provider.MediaStore.Images.Media.html">MediaStore.Images.Media</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="MediaStore.Video"></A>
+  <nobr><A HREF="android.provider.MediaStore.Video.html">MediaStore.Video</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="MediaStore.Video.VideoColumns"></A>
+  <nobr><A HREF="android.provider.MediaStore.Video.VideoColumns.html"><I>MediaStore.Video.VideoColumns</I></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="Settings"></A>
+  <nobr><A HREF="android.provider.Settings.html">Settings</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="Settings.System"></A>
+  <nobr><A HREF="android.provider.Settings.System.html">Settings.System</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/pkg_android.telephony.gsm.html b/docs/html/sdk/api_diff/3/changes/pkg_android.telephony.gsm.html
new file mode 100644
index 000000000000..d17223483e02
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/pkg_android.telephony.gsm.html
@@ -0,0 +1,120 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.telephony.gsm
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Package <A HREF="../../../../reference/android/telephony/gsm/package-summary.html" target="_top"><font size="+1"><tt>android.telephony.gsm</tt></font></A>
+</H2>
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Classes" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Changed Classes</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="SmsMessage"></A>
+  <nobr><A HREF="android.telephony.gsm.SmsMessage.html">SmsMessage</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/pkg_android.telephony.html b/docs/html/sdk/api_diff/3/changes/pkg_android.telephony.html
new file mode 100644
index 000000000000..8131269eab82
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/pkg_android.telephony.html
@@ -0,0 +1,142 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.telephony
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Package <A HREF="../../../../reference/android/telephony/package-summary.html" target="_top"><font size="+1"><tt>android.telephony</tt></font></A>
+</H2>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Classes" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Classes</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="NeighboringCellInfo"></A>
+  <nobr><A HREF="../../../../reference/android/telephony/NeighboringCellInfo.html" target="_top"><xfont size="+1"><tt>NeighboringCellInfo</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Classes" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Changed Classes</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="PhoneNumberUtils"></A>
+  <nobr><A HREF="android.telephony.PhoneNumberUtils.html">PhoneNumberUtils</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="TelephonyManager"></A>
+  <nobr><A HREF="android.telephony.TelephonyManager.html">TelephonyManager</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/pkg_android.test.html b/docs/html/sdk/api_diff/3/changes/pkg_android.test.html
new file mode 100644
index 000000000000..3b5edd42df00
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/pkg_android.test.html
@@ -0,0 +1,163 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.test
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Package <A HREF="../../../../reference/android/test/package-summary.html" target="_top"><font size="+1"><tt>android.test</tt></font></A>
+</H2>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Classes" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Classes</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="ActivityInstrumentationTestCase2"></A>
+  <nobr><A HREF="../../../../reference/android/test/ActivityInstrumentationTestCase2.html" target="_top"><xfont size="+1"><tt>ActivityInstrumentationTestCase2</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="ProviderTestCase2"></A>
+  <nobr><A HREF="../../../../reference/android/test/ProviderTestCase2.html" target="_top"><xfont size="+1"><tt>ProviderTestCase2</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Classes" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Changed Classes</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="ActivityInstrumentationTestCase"></A>
+  <nobr><A HREF="android.test.ActivityInstrumentationTestCase.html">ActivityInstrumentationTestCase</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="InstrumentationTestCase"></A>
+  <nobr><A HREF="android.test.InstrumentationTestCase.html">InstrumentationTestCase</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="ProviderTestCase"></A>
+  <nobr><A HREF="android.test.ProviderTestCase.html">ProviderTestCase</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="TouchUtils"></A>
+  <nobr><A HREF="android.test.TouchUtils.html">TouchUtils</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/pkg_android.test.mock.html b/docs/html/sdk/api_diff/3/changes/pkg_android.test.mock.html
new file mode 100644
index 000000000000..87a371cd22b1
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/pkg_android.test.mock.html
@@ -0,0 +1,120 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.test.mock
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Package <A HREF="../../../../reference/android/test/mock/package-summary.html" target="_top"><font size="+1"><tt>android.test.mock</tt></font></A>
+</H2>
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Classes" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Changed Classes</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="MockPackageManager"></A>
+  <nobr><A HREF="android.test.mock.MockPackageManager.html">MockPackageManager</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/pkg_android.test.suitebuilder.html b/docs/html/sdk/api_diff/3/changes/pkg_android.test.suitebuilder.html
new file mode 100644
index 000000000000..469db289da92
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/pkg_android.test.suitebuilder.html
@@ -0,0 +1,127 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.test.suitebuilder
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Package <A HREF="../../../../reference/android/test/suitebuilder/package-summary.html" target="_top"><font size="+1"><tt>android.test.suitebuilder</tt></font></A>
+</H2>
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Classes" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Changed Classes</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="TestMethod"></A>
+  <nobr><A HREF="android.test.suitebuilder.TestMethod.html">TestMethod</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="TestSuiteBuilder"></A>
+  <nobr><A HREF="android.test.suitebuilder.TestSuiteBuilder.html">TestSuiteBuilder</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/pkg_android.text.html b/docs/html/sdk/api_diff/3/changes/pkg_android.text.html
new file mode 100644
index 000000000000..ffc696676f16
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/pkg_android.text.html
@@ -0,0 +1,191 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.text
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Package <A HREF="../../../../reference/android/text/package-summary.html" target="_top"><font size="+1"><tt>android.text</tt></font></A>
+</H2>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Classes and Interfaces" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Classes and Interfaces</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="InputType"></A>
+  <nobr><A HREF="../../../../reference/android/text/InputType.html" target="_top"><xfont size="+1"><tt><I>InputType</I></tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="NoCopySpan"></A>
+  <nobr><A HREF="../../../../reference/android/text/NoCopySpan.html" target="_top"><xfont size="+1"><tt><I>NoCopySpan</I></tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="NoCopySpan.Concrete"></A>
+  <nobr><A HREF="../../../../reference/android/text/NoCopySpan.Concrete.html" target="_top"><xfont size="+1"><tt>NoCopySpan.Concrete</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="ParcelableSpan"></A>
+  <nobr><A HREF="../../../../reference/android/text/ParcelableSpan.html" target="_top"><xfont size="+1"><tt><I>ParcelableSpan</I></tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Classes and Interfaces" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Changed Classes and Interfaces</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="Annotation"></A>
+  <nobr><A HREF="android.text.Annotation.html">Annotation</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="AutoText"></A>
+  <nobr><A HREF="android.text.AutoText.html">AutoText</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="SpanWatcher"></A>
+  <nobr><A HREF="android.text.SpanWatcher.html"><I>SpanWatcher</I></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="Spanned"></A>
+  <nobr><A HREF="android.text.Spanned.html"><I>Spanned</I></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="TextUtils"></A>
+  <nobr><A HREF="android.text.TextUtils.html">TextUtils</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="TextWatcher"></A>
+  <nobr><A HREF="android.text.TextWatcher.html"><I>TextWatcher</I></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/pkg_android.text.method.html b/docs/html/sdk/api_diff/3/changes/pkg_android.text.method.html
new file mode 100644
index 000000000000..89b94ad3125b
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/pkg_android.text.method.html
@@ -0,0 +1,218 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.text.method
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Package <A HREF="../../../../reference/android/text/method/package-summary.html" target="_top"><font size="+1"><tt>android.text.method</tt></font></A>
+</H2>
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Classes and Interfaces" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Changed Classes and Interfaces</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="ArrowKeyMovementMethod"></A>
+  <nobr><A HREF="android.text.method.ArrowKeyMovementMethod.html">ArrowKeyMovementMethod</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="BaseKeyListener"></A>
+  <nobr><A HREF="android.text.method.BaseKeyListener.html">BaseKeyListener</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="DateKeyListener"></A>
+  <nobr><A HREF="android.text.method.DateKeyListener.html">DateKeyListener</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="DateTimeKeyListener"></A>
+  <nobr><A HREF="android.text.method.DateTimeKeyListener.html">DateTimeKeyListener</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="DialerKeyListener"></A>
+  <nobr><A HREF="android.text.method.DialerKeyListener.html">DialerKeyListener</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="DigitsKeyListener"></A>
+  <nobr><A HREF="android.text.method.DigitsKeyListener.html">DigitsKeyListener</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="KeyListener"></A>
+  <nobr><A HREF="android.text.method.KeyListener.html"><I>KeyListener</I></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="MetaKeyKeyListener"></A>
+  <nobr><A HREF="android.text.method.MetaKeyKeyListener.html">MetaKeyKeyListener</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="MovementMethod"></A>
+  <nobr><A HREF="android.text.method.MovementMethod.html"><I>MovementMethod</I></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="MultiTapKeyListener"></A>
+  <nobr><A HREF="android.text.method.MultiTapKeyListener.html">MultiTapKeyListener</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="QwertyKeyListener"></A>
+  <nobr><A HREF="android.text.method.QwertyKeyListener.html">QwertyKeyListener</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="ScrollingMovementMethod"></A>
+  <nobr><A HREF="android.text.method.ScrollingMovementMethod.html">ScrollingMovementMethod</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="TextKeyListener"></A>
+  <nobr><A HREF="android.text.method.TextKeyListener.html">TextKeyListener</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="TimeKeyListener"></A>
+  <nobr><A HREF="android.text.method.TimeKeyListener.html">TimeKeyListener</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="Touch"></A>
+  <nobr><A HREF="android.text.method.Touch.html">Touch</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/pkg_android.text.style.html b/docs/html/sdk/api_diff/3/changes/pkg_android.text.style.html
new file mode 100644
index 000000000000..e1e1fec0b4e9
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/pkg_android.text.style.html
@@ -0,0 +1,289 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.text.style
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Package <A HREF="../../../../reference/android/text/style/package-summary.html" target="_top"><font size="+1"><tt>android.text.style</tt></font></A>
+</H2>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Interfaces" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Interfaces</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="UpdateAppearance"></A>
+  <nobr><A HREF="../../../../reference/android/text/style/UpdateAppearance.html" target="_top"><xfont size="+1"><tt><I>UpdateAppearance</I></tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Classes and Interfaces" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Changed Classes and Interfaces</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="AbsoluteSizeSpan"></A>
+  <nobr><A HREF="android.text.style.AbsoluteSizeSpan.html">AbsoluteSizeSpan</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="AlignmentSpan.Standard"></A>
+  <nobr><A HREF="android.text.style.AlignmentSpan.Standard.html">AlignmentSpan.Standard</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="BackgroundColorSpan"></A>
+  <nobr><A HREF="android.text.style.BackgroundColorSpan.html">BackgroundColorSpan</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="BulletSpan"></A>
+  <nobr><A HREF="android.text.style.BulletSpan.html">BulletSpan</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="ClickableSpan"></A>
+  <nobr><A HREF="android.text.style.ClickableSpan.html">ClickableSpan</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="DynamicDrawableSpan"></A>
+  <nobr><A HREF="android.text.style.DynamicDrawableSpan.html">DynamicDrawableSpan</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="ForegroundColorSpan"></A>
+  <nobr><A HREF="android.text.style.ForegroundColorSpan.html">ForegroundColorSpan</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="ImageSpan"></A>
+  <nobr><A HREF="android.text.style.ImageSpan.html">ImageSpan</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="LeadingMarginSpan.Standard"></A>
+  <nobr><A HREF="android.text.style.LeadingMarginSpan.Standard.html">LeadingMarginSpan.Standard</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="MaskFilterSpan"></A>
+  <nobr><A HREF="android.text.style.MaskFilterSpan.html">MaskFilterSpan</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="QuoteSpan"></A>
+  <nobr><A HREF="android.text.style.QuoteSpan.html">QuoteSpan</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="RasterizerSpan"></A>
+  <nobr><A HREF="android.text.style.RasterizerSpan.html">RasterizerSpan</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="RelativeSizeSpan"></A>
+  <nobr><A HREF="android.text.style.RelativeSizeSpan.html">RelativeSizeSpan</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="ScaleXSpan"></A>
+  <nobr><A HREF="android.text.style.ScaleXSpan.html">ScaleXSpan</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="StrikethroughSpan"></A>
+  <nobr><A HREF="android.text.style.StrikethroughSpan.html">StrikethroughSpan</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="StyleSpan"></A>
+  <nobr><A HREF="android.text.style.StyleSpan.html">StyleSpan</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="SubscriptSpan"></A>
+  <nobr><A HREF="android.text.style.SubscriptSpan.html">SubscriptSpan</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="SuperscriptSpan"></A>
+  <nobr><A HREF="android.text.style.SuperscriptSpan.html">SuperscriptSpan</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="TextAppearanceSpan"></A>
+  <nobr><A HREF="android.text.style.TextAppearanceSpan.html">TextAppearanceSpan</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="TypefaceSpan"></A>
+  <nobr><A HREF="android.text.style.TypefaceSpan.html">TypefaceSpan</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="URLSpan"></A>
+  <nobr><A HREF="android.text.style.URLSpan.html">URLSpan</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="UnderlineSpan"></A>
+  <nobr><A HREF="android.text.style.UnderlineSpan.html">UnderlineSpan</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="UpdateLayout"></A>
+  <nobr><A HREF="android.text.style.UpdateLayout.html"><I>UpdateLayout</I></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/pkg_android.util.html b/docs/html/sdk/api_diff/3/changes/pkg_android.util.html
new file mode 100644
index 000000000000..7403be48c31e
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/pkg_android.util.html
@@ -0,0 +1,142 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.util
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Package <A HREF="../../../../reference/android/util/package-summary.html" target="_top"><font size="+1"><tt>android.util</tt></font></A>
+</H2>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Classes" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Classes</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="PrintStreamPrinter"></A>
+  <nobr><A HREF="../../../../reference/android/util/PrintStreamPrinter.html" target="_top"><xfont size="+1"><tt>PrintStreamPrinter</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Classes" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Changed Classes</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="SparseIntArray"></A>
+  <nobr><A HREF="android.util.SparseIntArray.html">SparseIntArray</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="TimeUtils"></A>
+  <nobr><A HREF="android.util.TimeUtils.html">TimeUtils</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/pkg_android.view.animation.html b/docs/html/sdk/api_diff/3/changes/pkg_android.view.animation.html
new file mode 100644
index 000000000000..30c1badc27d7
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/pkg_android.view.animation.html
@@ -0,0 +1,127 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.view.animation
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Package <A HREF="../../../../reference/android/view/animation/package-summary.html" target="_top"><font size="+1"><tt>android.view.animation</tt></font></A>
+</H2>
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Classes" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Changed Classes</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="Animation"></A>
+  <nobr><A HREF="android.view.animation.Animation.html">Animation</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="Transformation"></A>
+  <nobr><A HREF="android.view.animation.Transformation.html">Transformation</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/pkg_android.view.html b/docs/html/sdk/api_diff/3/changes/pkg_android.view.html
new file mode 100644
index 000000000000..9b4a0427dacd
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/pkg_android.view.html
@@ -0,0 +1,268 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.view
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Package <A HREF="../../../../reference/android/view/package-summary.html" target="_top"><font size="+1"><tt>android.view</tt></font></A>
+</H2>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Classes and Interfaces" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Classes and Interfaces</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="GestureDetector.OnDoubleTapListener"></A>
+  <nobr><A HREF="../../../../reference/android/view/GestureDetector.OnDoubleTapListener.html" target="_top"><xfont size="+1"><tt><I>GestureDetector.OnDoubleTapListener</I></tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="HapticFeedbackConstants"></A>
+  <nobr><A HREF="../../../../reference/android/view/HapticFeedbackConstants.html" target="_top"><xfont size="+1"><tt>HapticFeedbackConstants</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="OrientationEventListener"></A>
+  <nobr><A HREF="../../../../reference/android/view/OrientationEventListener.html" target="_top"><xfont size="+1"><tt>OrientationEventListener</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="ViewDebug.CapturedViewProperty"></A>
+  <nobr><A HREF="../../../../reference/android/view/ViewDebug.CapturedViewProperty.html" target="_top"><xfont size="+1"><tt>ViewDebug.CapturedViewProperty</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="ViewTreeObserver.OnScrollChangedListener"></A>
+  <nobr><A HREF="../../../../reference/android/view/ViewTreeObserver.OnScrollChangedListener.html" target="_top"><xfont size="+1"><tt><I>ViewTreeObserver.OnScrollChangedListener</I></tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Classes and Interfaces" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Changed Classes and Interfaces</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="GestureDetector"></A>
+  <nobr><A HREF="android.view.GestureDetector.html">GestureDetector</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="GestureDetector.SimpleOnGestureListener"></A>
+  <nobr><A HREF="android.view.GestureDetector.SimpleOnGestureListener.html">GestureDetector.SimpleOnGestureListener</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="Gravity"></A>
+  <nobr><A HREF="android.view.Gravity.html">Gravity</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="KeyCharacterMap"></A>
+  <nobr><A HREF="android.view.KeyCharacterMap.html">KeyCharacterMap</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="KeyEvent"></A>
+  <nobr><A HREF="android.view.KeyEvent.html">KeyEvent</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="Menu"></A>
+  <nobr><A HREF="android.view.Menu.html"><I>Menu</I></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="MotionEvent"></A>
+  <nobr><A HREF="android.view.MotionEvent.html">MotionEvent</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="OrientationListener"></A>
+  <nobr><A HREF="android.view.OrientationListener.html">OrientationListener</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="View"></A>
+  <nobr><A HREF="android.view.View.html">View</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="ViewConfiguration"></A>
+  <nobr><A HREF="android.view.ViewConfiguration.html">ViewConfiguration</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="ViewDebug"></A>
+  <nobr><A HREF="android.view.ViewDebug.html">ViewDebug</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="ViewGroup"></A>
+  <nobr><A HREF="android.view.ViewGroup.html">ViewGroup</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="ViewParent"></A>
+  <nobr><A HREF="android.view.ViewParent.html"><I>ViewParent</I></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="ViewTreeObserver"></A>
+  <nobr><A HREF="android.view.ViewTreeObserver.html">ViewTreeObserver</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="Window"></A>
+  <nobr><A HREF="android.view.Window.html">Window</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="WindowManager.LayoutParams"></A>
+  <nobr><A HREF="android.view.WindowManager.LayoutParams.html">WindowManager.LayoutParams</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/pkg_android.webkit.html b/docs/html/sdk/api_diff/3/changes/pkg_android.webkit.html
new file mode 100644
index 000000000000..339b9ab3b479
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/pkg_android.webkit.html
@@ -0,0 +1,170 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.webkit
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Package <A HREF="../../../../reference/android/webkit/package-summary.html" target="_top"><font size="+1"><tt>android.webkit</tt></font></A>
+</H2>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Classes" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Classes</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="PluginData"></A>
+  <nobr><A HREF="../../../../reference/android/webkit/PluginData.html" target="_top"><xfont size="+1"><tt>PluginData</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Classes and Interfaces" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Changed Classes and Interfaces</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="URLUtil"></A>
+  <nobr><A HREF="android.webkit.URLUtil.html">URLUtil</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="UrlInterceptHandler"></A>
+  <nobr><A HREF="android.webkit.UrlInterceptHandler.html"><I>UrlInterceptHandler</I></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="UrlInterceptRegistry"></A>
+  <nobr><A HREF="android.webkit.UrlInterceptRegistry.html">UrlInterceptRegistry</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="WebHistoryItem"></A>
+  <nobr><A HREF="android.webkit.WebHistoryItem.html">WebHistoryItem</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="WebSettings"></A>
+  <nobr><A HREF="android.webkit.WebSettings.html">WebSettings</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="WebView"></A>
+  <nobr><A HREF="android.webkit.WebView.html">WebView</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/pkg_android.widget.html b/docs/html/sdk/api_diff/3/changes/pkg_android.widget.html
new file mode 100644
index 000000000000..fc6e9015391a
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/pkg_android.widget.html
@@ -0,0 +1,310 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+android.widget
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Package <A HREF="../../../../reference/android/widget/package-summary.html" target="_top"><font size="+1"><tt>android.widget</tt></font></A>
+</H2>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Classes and Interfaces" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Classes and Interfaces</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="AlphabetIndexer"></A>
+  <nobr><A HREF="../../../../reference/android/widget/AlphabetIndexer.html" target="_top"><xfont size="+1"><tt>AlphabetIndexer</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="Chronometer.OnChronometerTickListener"></A>
+  <nobr><A HREF="../../../../reference/android/widget/Chronometer.OnChronometerTickListener.html" target="_top"><xfont size="+1"><tt><I>Chronometer.OnChronometerTickListener</I></tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="HorizontalScrollView"></A>
+  <nobr><A HREF="../../../../reference/android/widget/HorizontalScrollView.html" target="_top"><xfont size="+1"><tt>HorizontalScrollView</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="SectionIndexer"></A>
+  <nobr><A HREF="../../../../reference/android/widget/SectionIndexer.html" target="_top"><xfont size="+1"><tt><I>SectionIndexer</I></tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="SlidingDrawer"></A>
+  <nobr><A HREF="../../../../reference/android/widget/SlidingDrawer.html" target="_top"><xfont size="+1"><tt>SlidingDrawer</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="SlidingDrawer.OnDrawerCloseListener"></A>
+  <nobr><A HREF="../../../../reference/android/widget/SlidingDrawer.OnDrawerCloseListener.html" target="_top"><xfont size="+1"><tt><I>SlidingDrawer.OnDrawerCloseListener</I></tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="SlidingDrawer.OnDrawerOpenListener"></A>
+  <nobr><A HREF="../../../../reference/android/widget/SlidingDrawer.OnDrawerOpenListener.html" target="_top"><xfont size="+1"><tt><I>SlidingDrawer.OnDrawerOpenListener</I></tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="SlidingDrawer.OnDrawerScrollListener"></A>
+  <nobr><A HREF="../../../../reference/android/widget/SlidingDrawer.OnDrawerScrollListener.html" target="_top"><xfont size="+1"><tt><I>SlidingDrawer.OnDrawerScrollListener</I></tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="TextView.OnEditorActionListener"></A>
+  <nobr><A HREF="../../../../reference/android/widget/TextView.OnEditorActionListener.html" target="_top"><xfont size="+1"><tt><I>TextView.OnEditorActionListener</I></tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Classes and Interfaces" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Changed Classes and Interfaces</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="AbsListView"></A>
+  <nobr><A HREF="android.widget.AbsListView.html">AbsListView</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="AbsSeekBar"></A>
+  <nobr><A HREF="android.widget.AbsSeekBar.html">AbsSeekBar</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="AbsoluteLayout"></A>
+  <nobr><A HREF="android.widget.AbsoluteLayout.html">AbsoluteLayout</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="ArrayAdapter"></A>
+  <nobr><A HREF="android.widget.ArrayAdapter.html">ArrayAdapter</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="AutoCompleteTextView"></A>
+  <nobr><A HREF="android.widget.AutoCompleteTextView.html">AutoCompleteTextView</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="Chronometer"></A>
+  <nobr><A HREF="android.widget.Chronometer.html">Chronometer</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="CursorAdapter"></A>
+  <nobr><A HREF="android.widget.CursorAdapter.html">CursorAdapter</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="GridView"></A>
+  <nobr><A HREF="android.widget.GridView.html">GridView</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="ListView"></A>
+  <nobr><A HREF="android.widget.ListView.html">ListView</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="PopupWindow"></A>
+  <nobr><A HREF="android.widget.PopupWindow.html">PopupWindow</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="PopupWindow.OnDismissListener"></A>
+  <nobr><A HREF="android.widget.PopupWindow.OnDismissListener.html"><I>PopupWindow.OnDismissListener</I></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="ProgressBar"></A>
+  <nobr><A HREF="android.widget.ProgressBar.html">ProgressBar</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="RemoteViews"></A>
+  <nobr><A HREF="android.widget.RemoteViews.html">RemoteViews</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="RemoteViews.ActionException"></A>
+  <nobr><A HREF="android.widget.RemoteViews.ActionException.html">RemoteViews.ActionException</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="ResourceCursorAdapter"></A>
+  <nobr><A HREF="android.widget.ResourceCursorAdapter.html">ResourceCursorAdapter</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="Scroller"></A>
+  <nobr><A HREF="android.widget.Scroller.html">Scroller</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="SimpleCursorAdapter"></A>
+  <nobr><A HREF="android.widget.SimpleCursorAdapter.html">SimpleCursorAdapter</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="TextView"></A>
+  <nobr><A HREF="android.widget.TextView.html">TextView</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/pkg_dalvik.system.html b/docs/html/sdk/api_diff/3/changes/pkg_dalvik.system.html
new file mode 100644
index 000000000000..654be0fb246e
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/pkg_dalvik.system.html
@@ -0,0 +1,149 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+dalvik.system
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Package <A HREF="../../../../reference/dalvik/system/package-summary.html" target="_top"><font size="+1"><tt>dalvik.system</tt></font></A>
+</H2>
+<p>
+<a NAME="Added"></a>
+<TABLE summary="Added Classes" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Classes</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="DexClassLoader"></A>
+  <nobr><A HREF="../../../../reference/dalvik/system/DexClassLoader.html" target="_top"><xfont size="+1"><tt>DexClassLoader</tt></font></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Classes" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Changed Classes</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="DexFile"></A>
+  <nobr><A HREF="dalvik.system.DexFile.html">DexFile</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="VMDebug"></A>
+  <nobr><A HREF="dalvik.system.VMDebug.html">VMDebug</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="Zygote"></A>
+  <nobr><A HREF="dalvik.system.Zygote.html">Zygote</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/pkg_java.lang.html b/docs/html/sdk/api_diff/3/changes/pkg_java.lang.html
new file mode 100644
index 000000000000..d7699273d263
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/pkg_java.lang.html
@@ -0,0 +1,134 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+java.lang
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Package <A HREF="../../../../reference/java/lang/package-summary.html" target="_top"><font size="+1"><tt>java.lang</tt></font></A>
+</H2>
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Classes" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Changed Classes</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="Character.UnicodeBlock"></A>
+  <nobr><A HREF="java.lang.Character.UnicodeBlock.html">Character.UnicodeBlock</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="Class"></A>
+  <nobr><A HREF="java.lang.Class.html">Class</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="String"></A>
+  <nobr><A HREF="java.lang.String.html">String</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/pkg_java.lang.reflect.html b/docs/html/sdk/api_diff/3/changes/pkg_java.lang.reflect.html
new file mode 100644
index 000000000000..ccc643dd8c99
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/pkg_java.lang.reflect.html
@@ -0,0 +1,120 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+java.lang.reflect
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Package <A HREF="../../../../reference/java/lang/reflect/package-summary.html" target="_top"><font size="+1"><tt>java.lang.reflect</tt></font></A>
+</H2>
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Classes" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Changed Classes</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="Proxy"></A>
+  <nobr><A HREF="java.lang.reflect.Proxy.html">Proxy</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/pkg_java.net.html b/docs/html/sdk/api_diff/3/changes/pkg_java.net.html
new file mode 100644
index 000000000000..98cc83d2cd89
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/pkg_java.net.html
@@ -0,0 +1,120 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+java.net
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Package <A HREF="../../../../reference/java/net/package-summary.html" target="_top"><font size="+1"><tt>java.net</tt></font></A>
+</H2>
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Classes" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Changed Classes</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="Socket"></A>
+  <nobr><A HREF="java.net.Socket.html">Socket</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/pkg_java.util.html b/docs/html/sdk/api_diff/3/changes/pkg_java.util.html
new file mode 100644
index 000000000000..462c73b083b6
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/pkg_java.util.html
@@ -0,0 +1,120 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+java.util
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Package <A HREF="../../../../reference/java/util/package-summary.html" target="_top"><font size="+1"><tt>java.util</tt></font></A>
+</H2>
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Classes" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Changed Classes</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="Date"></A>
+  <nobr><A HREF="java.util.Date.html">Date</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/pkg_java.util.jar.html b/docs/html/sdk/api_diff/3/changes/pkg_java.util.jar.html
new file mode 100644
index 000000000000..f1ac6e5d7f7d
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/pkg_java.util.jar.html
@@ -0,0 +1,127 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+java.util.jar
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Package <A HREF="../../../../reference/java/util/jar/package-summary.html" target="_top"><font size="+1"><tt>java.util.jar</tt></font></A>
+</H2>
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Interfaces" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Changed Interfaces</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="Pack200.Packer"></A>
+  <nobr><A HREF="java.util.jar.Pack200.Packer.html"><I>Pack200.Packer</I></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="Pack200.Unpacker"></A>
+  <nobr><A HREF="java.util.jar.Pack200.Unpacker.html"><I>Pack200.Unpacker</I></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/changes/pkg_java.util.logging.html b/docs/html/sdk/api_diff/3/changes/pkg_java.util.logging.html
new file mode 100644
index 000000000000..f2cc23d8472e
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/changes/pkg_java.util.logging.html
@@ -0,0 +1,127 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<HTML style="overflow:auto;">
+<HEAD>
+<meta name="generator" content="JDiff v1.1.0">
+<!-- Generated by the JDiff Javadoc doclet -->
+<!-- (http://www.jdiff.org) -->
+<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
+<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
+<TITLE>
+java.util.logging
+</TITLE>
+<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
+<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
+<noscript>
+<style type="text/css">
+body{overflow:auto;}
+#body-content{position:relative; top:0;}
+#doc-content{overflow:visible;border-left:3px solid #666;}
+#side-nav{padding:0;}
+#side-nav .toggle-list ul {display:block;}
+#resize-packages-nav{border-bottom:3px solid #666;}
+</style>
+</noscript>
+<style type="text/css">
+body{background-image:url();padding:12px;}
+</style>
+</HEAD>
+<BODY>
+<!-- Start of nav bar -->
+<a name="top"></a>
+<div id="header" style="margin-bottom:0;padding-bottom:0;">
+<div id="headerLeft">
+<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
+</div>
+  <div id="headerRight">
+  <div id="headerLinks">
+<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
+<span class="text">
+<!-- &nbsp;<a href="#">English</a> | -->
+<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
+</span>
+</div>
+  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td colspan="2" class="diffspechead">API Diff Specification</td>
+      </tr>
+      <tr>
+        <td class="diffspec" style="padding-top:.25em">To Level:</td>
+        <td class="diffvaluenew" style="padding-top:.25em">3</td>
+      </tr>
+      <tr>
+        <td class="diffspec">From Level:</td>
+        <td class="diffvalueold">2</td>
+      </tr>
+      <tr>
+        <td class="diffspec">Generated</td>
+        <td class="diffvalue">2009.04.20 09:15</td>
+      </tr>
+    </table>
+    </div><!-- End and-diff-id -->
+  <div class="and-diff-id" style="margin-right:8px;">
+    <table class="diffspectable">
+      <tr>
+        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
+      </tr>
+    </table>
+  </div> <!-- End and-diff-id -->
+  </div> <!-- End headerRight -->
+  </div> <!-- End header -->
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+<div id="mainBodyFluid">
+<H2>
+Package <A HREF="../../../../reference/java/util/logging/package-summary.html" target="_top"><font size="+1"><tt>java.util.logging</tt></font></A>
+</H2>
+<p>
+<a NAME="Changed"></a>
+<TABLE summary="Changed Classes" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Changed Classes</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="Level"></A>
+  <nobr><A HREF="java.util.logging.Level.html">Level</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="LogManager"></A>
+  <nobr><A HREF="java.util.logging.LogManager.html">LogManager</A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+      </div>	
+      <div id="footer">
+        <div id="copyright">
+        Except as noted, this content is licensed under 
+        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
+        For details and restrictions, see the <a href="/license.html">Content License</a>.
+        </div>
+      <div id="footerlinks">
+      <p>
+        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
+        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
+        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
+      </p>
+    </div>
+    </div> <!-- end footer -->
+    </div><!-- end doc-content -->
+    </div> <!-- end body-content --> 
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  try {
+    var pageTracker = _gat._getTracker("UA-5831155-1");
+    pageTracker._setAllowAnchor(true);
+    pageTracker._initData();
+    pageTracker._trackPageview();
+  } catch(e) {}
+</script>
+</BODY>
+</HTML>
diff --git a/docs/html/sdk/api_diff/3/stylesheet-jdiff.css b/docs/html/sdk/api_diff/3/stylesheet-jdiff.css
new file mode 100644
index 000000000000..b3c1b9af86b9
--- /dev/null
+++ b/docs/html/sdk/api_diff/3/stylesheet-jdiff.css
@@ -0,0 +1,37 @@
+
+/* (http://www.jdiff.org) */
+
+div.and-diff-id {border: 1px solid #eee;position:relative;float:right;clear:both;padding:0px;}
+table.diffspectable {border:1px;padding:0px;margin:0px;}
+.diffspechead {background-color:#eee;}
+.diffspectable tr {border:0px;padding:0px;}
+.diffspectable td  {background-color:eee;border:0px;font-size:90%;font-weight:normal;padding:0px;padding-left:1px;padding-right:1px;text-align:center;color:777;}
+td.diffvalueold {color:orange;background-color:white;border:0px;font-size:80%;font-style:normal;text-align:left;padding:0px;padding-left:1px;padding-right:1px;line-height:.95em;}
+td.diffvaluenew {color:green;background-color:white;border:0px;font-size:80%;font-weight:normal;text-align:left;padding:0px;padding-left:1px;padding-right:1px;line-height:.95em;}
+td.diffvalue {color:444;background-color:white;border:0px;font-size:80%;font-weight:normal;text-align:left;padding:0px;padding-left:1px;padding-right:1px;line-height:.95em;}
+td.diffspec {background-color:white;border:0px;font-size:80%;font-weight:normal;padding:1px;color:444;text-align:right;padding-right:.5em;line-height:.95em;}
+tt {font-size:11pt;font-family:monospace;}
+.indexHeader {
+  font-size:96%;
+  line-height:.8em;}
+.jdiffIndex td {
+  font-size:96%;
+  xline-height:.8em;
+  padding:2px;
+  padding-left:1em;}
+.indexText {
+  font-size:100%;
+  padding-left:1em;}
+#indexTableCaption {
+  font-size:96%;
+  margin-top:.25em;
+  margin-bottom:0;
+  }
+.hiddenlink {
+  font-size:96%;
+  line-height:.8em;
+  text-decoration:none;}
+a {
+  text-decoration:none;}
+a:hover {
+  text-decoration:underline;}
diff --git a/docs/html/sdk/sdk_toc.cs b/docs/html/sdk/sdk_toc.cs
index 8c7a0a764fe6..1e5122ffb644 100644
--- a/docs/html/sdk/sdk_toc.cs
+++ b/docs/html/sdk/sdk_toc.cs
@@ -2,17 +2,17 @@
 <ul>
   <li><?cs 
    if:android.whichdoc != "online" ?>
-    <h2>Android 1.5 SDK, r1</h2><?cs 
+    <h2>Android <?cs var:sdk.version ?> SDK, r<?cs var:sdk.rel.id ?></h2><?cs 
    else ?>
     <h2>Current SDK Release</h2><?cs 
    /if ?>
     <ul><?cs 
      if:android.whichdoc == "online" ?>
-      <li><a href="<?cs var:toroot ?>sdk/1.1_r1/index.html">Download</a></li><?cs 
+      <li><a href="<?cs var:toroot ?>sdk/<?cs var:sdk.current ?>/index.html">Download</a></li><?cs 
      /if ?>
-      <li><a href="<?cs var:toroot ?>sdk/1.1_r1/installing.html">Installing</a></li>
-      <li><a href="<?cs var:toroot ?>sdk/1.1_r1/upgrading.html">Upgrading</a></li>
-      <li><a href="<?cs var:toroot ?>sdk/1.1_r1/requirements.html">System Requirements</a></li>
+      <li><a href="<?cs var:toroot ?>sdk/<?cs var:sdk.current ?>/installing.html">Installing</a></li>
+      <li><a href="<?cs var:toroot ?>sdk/<?cs var:sdk.current ?>/upgrading.html">Upgrading</a></li>
+      <li><a href="<?cs var:toroot ?>sdk/<?cs var:sdk.current ?>/requirements.html">System Requirements</a></li>
     </ul>
     <ul>
       <li><a href="<?cs var:toroot ?>sdk/terms.html">SDK Terms and Conditions</a></li>
@@ -20,7 +20,7 @@
     </ul><?cs 
  if:android.whichdoc == "online" ?>
   <li>
-    <h2>Android System Images</h2>
+    <h2>System Image Version Notes</h2>
     <ul>
       <li><a href="<?cs var:toroot ?>sdk/android-1.5.html">Android 1.5 Version Notes</a></li>
       <li><a href="<?cs var:toroot ?>sdk/android-1.1.html">Android 1.1 Version Notes</a></li>
@@ -29,8 +29,9 @@
   <li>
     <h2>Previous SDK Releases</h2>
     <ul>
-      <li><a href="<?cs var:toroot ?>sdk/1.0_r2/index.html">Android 1.0 SDK, release 2</a></li>
-      <li><a href="<?cs var:toroot ?>sdk/1.0_r1/index.html">Android 1.0 SDK, release 1</a></li>
+      <li><a href="<?cs var:toroot ?>sdk/1.1_r1/index.html">Android 1.1 SDK, r1</a></li>
+      <li><a href="<?cs var:toroot ?>sdk/1.0_r2/index.html">Android 1.0 SDK, r2</a></li>
+      <li><a href="<?cs var:toroot ?>sdk/1.0_r1/index.html">Android 1.0 SDK, r1</a></li>
       <li><a href="<?cs var:toroot ?>sdk/older_releases.html">Older Releases</a></li>
     </ul>
   </li><?cs 
diff --git a/docs/html/sdk/terms.jd b/docs/html/sdk/terms.jd
index b3c5ea253cc4..614a438ef17c 100644
--- a/docs/html/sdk/terms.jd
+++ b/docs/html/sdk/terms.jd
@@ -8,7 +8,7 @@ hide_license_footer=true
 	1. Introduction
 </h2>
 <p>
-	1.1 The Android Software Development Kit (referred to in this License Agreement as the "SDK" and specifically including the Android system files, packaged APIs, and Google Services add-ons) is licensed to you subject to the terms of this License Agreement. This License Agreement forms a legally binding contract between you and Google in relation to your use of the SDK.
+	1.1 The Android Software Development Kit (referred to in this License Agreement as the "SDK" and specifically including the Android system files, packaged APIs, and Google APIs add-ons) is licensed to you subject to the terms of this License Agreement. This License Agreement forms a legally binding contract between you and Google in relation to your use of the SDK.
 
 </p>
 <p>
@@ -46,7 +46,7 @@ hide_license_footer=true
 
 </p>
 <p>
-	3.3. Except to the extent required by applicable third party licenses, you may not copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK. Except to the extent required by applicable third party licenses, you may not load any part of the SDK onto a mobile handset or any other hardware device except a personal computer, combine any part of the SDK with other software, or distribute any software or device incorporating a part of the SDK. 
+	3.3 Except to the extent required by applicable third party licenses, you may not copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK. Except to the extent required by applicable third party licenses, you may not load any part of the SDK onto a mobile handset or any other hardware device except a personal computer, combine any part of the SDK with other software, or distribute any software or device incorporating a part of the SDK. 
 </p>
 <p>
 	3.4 Use, reproduction and distribution of components of the SDK licensed under an open source software license are governed solely by the terms of that open source software license and not this License Agreement.
diff --git a/docs/html/sdk/terms_body.html b/docs/html/sdk/terms_body.html
index a73801f06f86..03e09066d98c 100644
--- a/docs/html/sdk/terms_body.html
+++ b/docs/html/sdk/terms_body.html
@@ -5,7 +5,7 @@
 	1. Introduction
 </h2>
 <p>
-	1.1 The Android Software Development Kit (referred to in this License Agreement as the "SDK" and specifically including the Android system files, packaged APIs, and Google Services add-ons) is licensed to you subject to the terms of this License Agreement. This License Agreement forms a legally binding contract between you and Google in relation to your use of the SDK.
+	1.1 The Android Software Development Kit (referred to in this License Agreement as the "SDK" and specifically including the Android system files, packaged APIs, and Google APIs add-ons) is licensed to you subject to the terms of this License Agreement. This License Agreement forms a legally binding contract between you and Google in relation to your use of the SDK.
 
 </p>
 <p>
@@ -43,7 +43,7 @@
 
 </p>
 <p>
-	3.3. Except to the extent required by applicable third party licenses, you may not copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK. Except to the extent required by applicable third party licenses, you may not load any part of the SDK onto a mobile handset or any other hardware device except a personal computer, combine any part of the SDK with other software, or distribute any software or device incorporating a part of the SDK. 
+	3.3 Except to the extent required by applicable third party licenses, you may not copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK. Except to the extent required by applicable third party licenses, you may not load any part of the SDK onto a mobile handset or any other hardware device except a personal computer, combine any part of the SDK with other software, or distribute any software or device incorporating a part of the SDK. 
 </p>
 <p>
 	3.4 Use, reproduction and distribution of components of the SDK licensed under an open source software license are governed solely by the terms of that open source software license and not this License Agreement.
@@ -201,4 +201,4 @@
 </p>
 <p>
 	<em>April 10, 2009</em>
-</p>
\ No newline at end of file
+</p>
diff --git a/include/media/AudioRecord.h b/include/media/AudioRecord.h
index 7164b78e0735..6aa40d008eba 100644
--- a/include/media/AudioRecord.h
+++ b/include/media/AudioRecord.h
@@ -312,7 +312,6 @@ private:
 
             bool processAudioBuffer(const sp<ClientRecordThread>& thread);
 
-    sp<IAudioFlinger>       mAudioFlinger;
     sp<IAudioRecord>        mAudioRecord;
     sp<IMemory>             mCblkMemory;
     sp<ClientRecordThread>  mClientRecordThread;
diff --git a/include/media/AudioTrack.h b/include/media/AudioTrack.h
index 76459786ee0e..ba0467c1603c 100644
--- a/include/media/AudioTrack.h
+++ b/include/media/AudioTrack.h
@@ -383,7 +383,6 @@ private:
 
             bool processAudioBuffer(const sp<AudioTrackThread>& thread);
 
-    sp<IAudioFlinger>       mAudioFlinger;
     sp<IAudioTrack>         mAudioTrack;
     sp<IMemory>             mCblkMemory;
     sp<AudioTrackThread>    mAudioTrackThread;
diff --git a/libs/audioflinger/AudioFlinger.cpp b/libs/audioflinger/AudioFlinger.cpp
index 43df7ddfdb2b..a4050b30e20a 100644
--- a/libs/audioflinger/AudioFlinger.cpp
+++ b/libs/audioflinger/AudioFlinger.cpp
@@ -655,16 +655,12 @@ status_t AudioFlinger::setStreamVolume(int stream, float value)
     
     if (stream == AudioSystem::VOICE_CALL ||
         stream == AudioSystem::BLUETOOTH_SCO) {
-        float hwValue = value;
+        float hwValue;
         if (stream == AudioSystem::VOICE_CALL) {
             hwValue = (float)AudioSystem::logToLinear(value)/100.0f;
-            // FIXME: This is a temporary fix to re-base the internally
-            // generated in-call audio so that it is never muted, which is
-            // already the case for the hardware routed in-call audio.
-            // When audio stream handling is reworked, this should be
-            // addressed more cleanly.  Fixes #1324; see discussion at
-            // http://review.source.android.com/8224
-            value = value * 0.99 + 0.01;        
+            // offset value to reflect actual hardware volume that never reaches 0
+            // 1% corresponds roughly to first step in VOICE_CALL stream volume setting (see AudioService.java)
+            value = 0.01 + 0.99 * value;
         } else { // (type == AudioSystem::BLUETOOTH_SCO)
             hwValue = 1.0f;
         }
@@ -681,6 +677,11 @@ status_t AudioFlinger::setStreamVolume(int stream, float value)
     mA2dpMixerThread->setStreamVolume(stream, value);
 #endif
 
+    mHardwareMixerThread->setStreamVolume(stream, value);
+#ifdef WITH_A2DP
+    mA2dpMixerThread->setStreamVolume(stream, value);
+#endif
+
     return ret;
 }
 
@@ -718,15 +719,14 @@ float AudioFlinger::streamVolume(int stream) const
     if (uint32_t(stream) >= AudioSystem::NUM_STREAM_TYPES) {
         return 0.0f;
     }
-    float value = mHardwareMixerThread->streamVolume(stream);
     
+    float volume = mHardwareMixerThread->streamVolume(stream); 
+    // remove correction applied by setStreamVolume()
     if (stream == AudioSystem::VOICE_CALL) {
-        // FIXME: Re-base internally generated in-call audio,
-        // reverse of above in setStreamVolume.
-        value = (value - 0.01) / 0.99;
+        volume = (volume - 0.01) / 0.99 ;
     }
     
-    return value;
+    return volume;
 }
 
 bool AudioFlinger::streamMute(int stream) const
@@ -829,17 +829,12 @@ void AudioFlinger::handleForcedSpeakerRoute(int command)
                 if (mForcedRoute == 0 && !(mSavedRoute & AudioSystem::ROUTE_SPEAKER)) {
                     LOGV("Route forced to Speaker ON %08x", mSavedRoute | AudioSystem::ROUTE_SPEAKER);
                     mHardwareMixerThread->setStreamMute(AudioSystem::MUSIC, true);
-                    mHardwareStatus = AUDIO_HW_SET_MASTER_VOLUME;
-                    mAudioHardware->setMasterVolume(0);
                     usleep(mHardwareMixerThread->latency()*1000);
                     mHardwareStatus = AUDIO_HW_SET_ROUTING;
                     mAudioHardware->setRouting(AudioSystem::MODE_NORMAL, mSavedRoute | AudioSystem::ROUTE_SPEAKER);
                     mHardwareStatus = AUDIO_HW_IDLE;
                     // delay track start so that audio hardware has time to siwtch routes
                     usleep(kStartSleepTime);
-                    mHardwareStatus = AUDIO_HW_SET_MASTER_VOLUME;
-                    mAudioHardware->setMasterVolume(mHardwareMixerThread->masterVolume());
-                    mHardwareStatus = AUDIO_HW_IDLE;
                 }
                 mForcedRoute = AudioSystem::ROUTE_SPEAKER;
             }
@@ -1497,18 +1492,6 @@ status_t AudioFlinger::MixerThread::addTrack_l(const sp<Track>& track)
     return status;
 }
 
-// removeTrack_l() must be called with AudioFlinger::mLock held
-void AudioFlinger::MixerThread::removeTrack_l(wp<Track> track, int name)
-{
-    sp<Track> t = track.promote();
-    if (t!=NULL && (t->mState <= TrackBase::STOPPED)) {
-        t->reset();
-        deleteTrackName_l(name);
-        removeActiveTrack_l(track);
-        mAudioFlinger->mWaitWorkCV.broadcast();
-    }
-}
-
 // destroyTrack_l() must be called with AudioFlinger::mLock held
 void AudioFlinger::MixerThread::destroyTrack_l(const sp<Track>& track)
 {
@@ -1714,7 +1697,7 @@ void* AudioFlinger::MixerThread::TrackBase::getBuffer(uint32_t offset, uint32_t
 
     // Check validity of returned pointer in case the track control block would have been corrupted.
     if (bufferStart < mBuffer || bufferStart > bufferEnd || bufferEnd > mBufferEnd || 
-            cblk->channels == 2 && ((unsigned long)bufferStart & 3) ) {
+        (cblk->channels == 2 && ((unsigned long)bufferStart & 3))) {
         LOGE("TrackBase::getBuffer buffer out of range:\n    start: %p, end %p , mBuffer %p mBufferEnd %p\n    \
                 server %d, serverBase %d, user %d, userBase %d, channels %d",
                 bufferStart, bufferEnd, mBuffer, mBufferEnd,
@@ -1750,7 +1733,6 @@ AudioFlinger::MixerThread::Track::~Track()
     wp<Track> weak(this); // never create a strong ref from the dtor
     Mutex::Autolock _l(mMixerThread->mAudioFlinger->mLock);
     mState = TERMINATED;
-    mMixerThread->removeTrack_l(weak, mName);
 }
 
 void AudioFlinger::MixerThread::Track::destroy()
diff --git a/libs/audioflinger/AudioFlinger.h b/libs/audioflinger/AudioFlinger.h
index db5cc7444ba3..c7ca9ecc1012 100644
--- a/libs/audioflinger/AudioFlinger.h
+++ b/libs/audioflinger/AudioFlinger.h
@@ -501,7 +501,6 @@ private:
         MixerThread& operator = (const MixerThread&);
   
         status_t    addTrack_l(const sp<Track>& track);
-        void        removeTrack_l(wp<Track> track, int name);
         void        destroyTrack_l(const sp<Track>& track);
         int         getTrackName_l();
         void        deleteTrackName_l(int name);
diff --git a/libs/audioflinger/AudioHardwareInterface.cpp b/libs/audioflinger/AudioHardwareInterface.cpp
index ac76a19d8435..cc1bd8ffa229 100644
--- a/libs/audioflinger/AudioHardwareInterface.cpp
+++ b/libs/audioflinger/AudioHardwareInterface.cpp
@@ -53,7 +53,7 @@ static const char* routeStrings[] =
     "EARPIECE ",
     "SPEAKER ",
     "BLUETOOTH ",
-    "HEADSET "
+    "HEADSET ",
     "BLUETOOTH_A2DP "
 };
 static const char* routeNone = "NONE";
diff --git a/libs/utils/ZipFile.cpp b/libs/utils/ZipFile.cpp
index 89aa874b4941..2132d2224eeb 100644
--- a/libs/utils/ZipFile.cpp
+++ b/libs/utils/ZipFile.cpp
@@ -94,10 +94,10 @@ status_t ZipFile::open(const char* zipFileName, int flags)
     }
     mZipFp = fopen(zipFileName, openflags);
     if (mZipFp == NULL) {
-		int err = errno;
-		LOGD("fopen failed: %d\n", err);
+        int err = errno;
+        LOGD("fopen failed: %d\n", err);
         return errnoToStatus(err);
-	}
+    }
 
     status_t result;
     if (!newArchive) {
@@ -221,8 +221,8 @@ status_t ZipFile::readCentralDir(void)
 
     buf = new unsigned char[EndOfCentralDir::kMaxEOCDSearch];
     if (buf == NULL) {
-		LOGD("Failure allocating %d bytes for EOCD search",
-			 EndOfCentralDir::kMaxEOCDSearch);
+        LOGD("Failure allocating %d bytes for EOCD search",
+             EndOfCentralDir::kMaxEOCDSearch);
         result = NO_MEMORY;
         goto bail;
     }
@@ -235,7 +235,7 @@ status_t ZipFile::readCentralDir(void)
         readAmount = (long) fileLength;
     }
     if (fseek(mZipFp, seekStart, SEEK_SET) != 0) {
-		LOGD("Failure seeking to end of zip at %ld", (long) seekStart);
+        LOGD("Failure seeking to end of zip at %ld", (long) seekStart);
         result = UNKNOWN_ERROR;
         goto bail;
     }
@@ -265,9 +265,9 @@ status_t ZipFile::readCentralDir(void)
     /* extract eocd values */
     result = mEOCD.readBuf(buf + i, readAmount - i);
     if (result != NO_ERROR) {
-		LOGD("Failure reading %ld bytes of EOCD values", readAmount - i);
+        LOGD("Failure reading %ld bytes of EOCD values", readAmount - i);
         goto bail;
-	}
+    }
     //mEOCD.dump();
 
     if (mEOCD.mDiskNumber != 0 || mEOCD.mDiskWithCentralDir != 0 ||
@@ -293,8 +293,8 @@ status_t ZipFile::readCentralDir(void)
      * we're hoping to preserve.
      */
     if (fseek(mZipFp, mEOCD.mCentralDirOffset, SEEK_SET) != 0) {
-		LOGD("Failure seeking to central dir offset %ld\n",
-			 mEOCD.mCentralDirOffset);
+        LOGD("Failure seeking to central dir offset %ld\n",
+             mEOCD.mCentralDirOffset);
         result = UNKNOWN_ERROR;
         goto bail;
     }
@@ -743,61 +743,61 @@ status_t ZipFile::compressFpToFp(FILE* dstFp, FILE* srcFp,
     const void* data, size_t size, unsigned long* pCRC32)
 {
     status_t result = NO_ERROR;
-	const size_t kBufSize = 32768;
-	unsigned char* inBuf = NULL;
-	unsigned char* outBuf = NULL;
-	z_stream zstream;
+    const size_t kBufSize = 32768;
+    unsigned char* inBuf = NULL;
+    unsigned char* outBuf = NULL;
+    z_stream zstream;
     bool atEof = false;     // no feof() aviailable yet
-	unsigned long crc;
-	int zerr;
-
-	/*
-	 * Create an input buffer and an output buffer.
-	 */
-	inBuf = new unsigned char[kBufSize];
-	outBuf = new unsigned char[kBufSize];
-	if (inBuf == NULL || outBuf == NULL) {
-		result = NO_MEMORY;
-		goto bail;
-	}
-
-	/*
-	 * Initialize the zlib stream.
-	 */
-	memset(&zstream, 0, sizeof(zstream));
-	zstream.zalloc = Z_NULL;
-	zstream.zfree = Z_NULL;
-	zstream.opaque = Z_NULL;
-	zstream.next_in = NULL;
-	zstream.avail_in = 0;
-	zstream.next_out = outBuf;
-	zstream.avail_out = kBufSize;
-	zstream.data_type = Z_UNKNOWN;
-
-	zerr = deflateInit2(&zstream, Z_BEST_COMPRESSION,
-		Z_DEFLATED, -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY);
-	if (zerr != Z_OK) {
-		result = UNKNOWN_ERROR;
-		if (zerr == Z_VERSION_ERROR) {
-			LOGE("Installed zlib is not compatible with linked version (%s)\n",
-				ZLIB_VERSION);
-		} else {
-			LOGD("Call to deflateInit2 failed (zerr=%d)\n", zerr);
-		}
-		goto bail;
-	}
-
- 	crc = crc32(0L, Z_NULL, 0);
-
-	/*
-	 * Loop while we have data.
-	 */
-	do {
-		size_t getSize;
-		int flush;
-
-		/* only read if the input buffer is empty */
-		if (zstream.avail_in == 0 && !atEof) {
+    unsigned long crc;
+    int zerr;
+
+    /*
+     * Create an input buffer and an output buffer.
+     */
+    inBuf = new unsigned char[kBufSize];
+    outBuf = new unsigned char[kBufSize];
+    if (inBuf == NULL || outBuf == NULL) {
+        result = NO_MEMORY;
+        goto bail;
+    }
+
+    /*
+     * Initialize the zlib stream.
+     */
+    memset(&zstream, 0, sizeof(zstream));
+    zstream.zalloc = Z_NULL;
+    zstream.zfree = Z_NULL;
+    zstream.opaque = Z_NULL;
+    zstream.next_in = NULL;
+    zstream.avail_in = 0;
+    zstream.next_out = outBuf;
+    zstream.avail_out = kBufSize;
+    zstream.data_type = Z_UNKNOWN;
+
+    zerr = deflateInit2(&zstream, Z_BEST_COMPRESSION,
+        Z_DEFLATED, -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY);
+    if (zerr != Z_OK) {
+        result = UNKNOWN_ERROR;
+        if (zerr == Z_VERSION_ERROR) {
+            LOGE("Installed zlib is not compatible with linked version (%s)\n",
+                ZLIB_VERSION);
+        } else {
+            LOGD("Call to deflateInit2 failed (zerr=%d)\n", zerr);
+        }
+        goto bail;
+    }
+
+    crc = crc32(0L, Z_NULL, 0);
+
+    /*
+     * Loop while we have data.
+     */
+    do {
+        size_t getSize;
+        int flush;
+
+        /* only read if the input buffer is empty */
+        if (zstream.avail_in == 0 && !atEof) {
             LOGV("+++ reading %d bytes\n", (int)kBufSize);
             if (data) {
                 getSize = size > kBufSize ? kBufSize : size;
@@ -817,54 +817,54 @@ status_t ZipFile::compressFpToFp(FILE* dstFp, FILE* srcFp,
                 atEof = true;
             }
 
-			crc = crc32(crc, inBuf, getSize);
-
-			zstream.next_in = inBuf;
-			zstream.avail_in = getSize;
-		}
-
-		if (atEof)
-			flush = Z_FINISH;       /* tell zlib that we're done */
-		else
-			flush = Z_NO_FLUSH;     /* more to come! */
-
-		zerr = deflate(&zstream, flush);
-		if (zerr != Z_OK && zerr != Z_STREAM_END) {
-			LOGD("zlib deflate call failed (zerr=%d)\n", zerr);
-			result = UNKNOWN_ERROR;
-			goto z_bail;
-		}
-
-		/* write when we're full or when we're done */
-		if (zstream.avail_out == 0 ||
-			(zerr == Z_STREAM_END && zstream.avail_out != (uInt) kBufSize))
-		{
-			LOGV("+++ writing %d bytes\n", (int) (zstream.next_out - outBuf));
+            crc = crc32(crc, inBuf, getSize);
+
+            zstream.next_in = inBuf;
+            zstream.avail_in = getSize;
+        }
+
+        if (atEof)
+            flush = Z_FINISH;       /* tell zlib that we're done */
+        else
+            flush = Z_NO_FLUSH;     /* more to come! */
+
+        zerr = deflate(&zstream, flush);
+        if (zerr != Z_OK && zerr != Z_STREAM_END) {
+            LOGD("zlib deflate call failed (zerr=%d)\n", zerr);
+            result = UNKNOWN_ERROR;
+            goto z_bail;
+        }
+
+        /* write when we're full or when we're done */
+        if (zstream.avail_out == 0 ||
+            (zerr == Z_STREAM_END && zstream.avail_out != (uInt) kBufSize))
+        {
+            LOGV("+++ writing %d bytes\n", (int) (zstream.next_out - outBuf));
             if (fwrite(outBuf, 1, zstream.next_out - outBuf, dstFp) !=
                 (size_t)(zstream.next_out - outBuf))
             {
-				LOGD("write %d failed in deflate\n",
+                LOGD("write %d failed in deflate\n",
                     (int) (zstream.next_out - outBuf));
-				goto z_bail;
-			}
+                goto z_bail;
+            }
 
-			zstream.next_out = outBuf;
-			zstream.avail_out = kBufSize;
-		}
-	} while (zerr == Z_OK);
+            zstream.next_out = outBuf;
+            zstream.avail_out = kBufSize;
+        }
+    } while (zerr == Z_OK);
 
-	assert(zerr == Z_STREAM_END);       /* other errors should've been caught */
+    assert(zerr == Z_STREAM_END);       /* other errors should've been caught */
 
-	*pCRC32 = crc;
+    *pCRC32 = crc;
 
 z_bail:
-	deflateEnd(&zstream);        /* free up any allocated structures */
+    deflateEnd(&zstream);        /* free up any allocated structures */
 
 bail:
-	delete[] inBuf;
-	delete[] outBuf;
+    delete[] inBuf;
+    delete[] outBuf;
 
-	return result;
+    return result;
 }
 
 /*
@@ -1206,7 +1206,7 @@ bail:
 
 /*
  * ===========================================================================
- *		ZipFile::EndOfCentralDir
+ *      ZipFile::EndOfCentralDir
  * ===========================================================================
  */
 
diff --git a/location/java/android/location/Geocoder.java b/location/java/android/location/Geocoder.java
index 709ad23fd787..2ce127367a85 100644
--- a/location/java/android/location/Geocoder.java
+++ b/location/java/android/location/Geocoder.java
@@ -37,6 +37,10 @@ import java.util.List;
  * reverse geocoded location description may vary, for example one
  * might contain the full street address of the closest building, while
  * another might contain only a city name and postal code.
+ *
+ * The Geocoder class requires a backend service that is not included in
+ * the core android framework.  The Geocoder query methods will return an
+ * empty list if there no backend service in the platform.
  */
 public final class Geocoder {
     private static final String TAG = "Geocoder";
@@ -94,8 +98,8 @@ public final class Geocoder {
      * @param longitude the longitude a point for the search
      * @param maxResults max number of addresses to return. Smaller numbers (1 to 5) are recommended
      *
-     * @return a list of Address objects or null if no matches were
-     * found.
+     * @return a list of Address objects. Returns null or empty list if no matches were
+     * found or there is no backend service available.
      *
      * @throws IllegalArgumentException if latitude is
      * less than -90 or greater than 90
@@ -143,7 +147,8 @@ public final class Geocoder {
      * @param locationName a user-supplied description of a location
      * @param maxResults max number of results to return. Smaller numbers (1 to 5) are recommended
      *
-     * @return a list of Address objects or null if no matches were found.
+     * @return a list of Address objects. Returns null or empty list if no matches were
+     * found or there is no backend service available.
      *
      * @throws IllegalArgumentException if locationName is null
      * @throws IOException if the network is unavailable or any other
@@ -192,7 +197,8 @@ public final class Geocoder {
      * @param upperRightLatitude the latitude of the upper right corner of the bounding box
      * @param upperRightLongitude the longitude of the upper right corner of the bounding box
      *
-     * @return a list of Address objects or null if no matches were found.
+     * @return a list of Address objects. Returns null or empty list if no matches were
+     * found or there is no backend service available.
      *
      * @throws IllegalArgumentException if locationName is null
      * @throws IllegalArgumentException if any latitude is
diff --git a/location/java/android/location/IGeocodeProvider.aidl b/location/java/android/location/IGeocodeProvider.aidl
new file mode 100644
index 000000000000..e79e8d2db623
--- /dev/null
+++ b/location/java/android/location/IGeocodeProvider.aidl
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.location;
+
+import android.location.Address;
+
+/**
+ * An interface for location providers implementing the Geocoder services.
+ *
+ * {@hide}
+ */
+interface IGeocodeProvider {
+
+    String getFromLocation(double latitude, double longitude, int maxResults,
+        String language, String country, String variant, String appName, out List<Address> addrs);
+
+    String getFromLocationName(String locationName,
+        double lowerLeftLatitude, double lowerLeftLongitude,
+        double upperRightLatitude, double upperRightLongitude, int maxResults,
+        String language, String country, String variant, String appName, out List<Address> addrs);
+}
diff --git a/location/java/android/location/ILocationManager.aidl b/location/java/android/location/ILocationManager.aidl
index 86bd8b6e6f27..7d35814e513f 100644
--- a/location/java/android/location/ILocationManager.aidl
+++ b/location/java/android/location/ILocationManager.aidl
@@ -18,6 +18,7 @@ package android.location;
 
 import android.app.PendingIntent;
 import android.location.Address;
+import android.location.IGeocodeProvider;
 import android.location.IGpsStatusListener;
 import android.location.ILocationCollector;
 import android.location.ILocationListener;
@@ -77,7 +78,8 @@ interface ILocationManager
     void setTestProviderStatus(String provider, int status, in Bundle extras, long updateTime);
     void clearTestProviderStatus(String provider);
 
-    /* for installing Network Location Provider */
+    /* for installing external Location Providers */
     void setNetworkLocationProvider(ILocationProvider provider);
     void setLocationCollector(ILocationCollector collector);
+    void setGeocodeProvider(IGeocodeProvider provider);
 }
diff --git a/location/java/android/location/ILocationProvider.aidl b/location/java/android/location/ILocationProvider.aidl
index 6f9daff31064..82533a5f78a0 100644
--- a/location/java/android/location/ILocationProvider.aidl
+++ b/location/java/android/location/ILocationProvider.aidl
@@ -16,7 +16,6 @@
 
 package android.location;
 
-import android.location.Address;
 import android.os.Bundle;
 
 /**
@@ -47,15 +46,8 @@ interface ILocationProvider {
     void setMinTime(long minTime);
     void updateNetworkState(int state);
     boolean sendExtraCommand(String command, inout Bundle extras);
-
-    /* the following are only used for NetworkLocationProvider */
-    void updateCellLockStatus(boolean acquired);
-    void addListener(in String[] applications);
-    void removeListener(in String[] applications);
-    String getFromLocation(double latitude, double longitude, int maxResults,
-        String language, String country, String variant, String appName, out List<Address> addrs);
-    String getFromLocationName(String locationName,
-        double lowerLeftLatitude, double lowerLeftLongitude,
-        double upperRightLatitude, double upperRightLongitude, int maxResults,
-        String language, String country, String variant, String appName, out List<Address> addrs);
+    void addListener(int uid);
+    void removeListener(int uid);
+    void wakeLockAcquired();
+    void wakeLockReleased();
 }
diff --git a/location/java/android/location/LocationProviderImpl.java b/location/java/android/location/LocationProviderImpl.java
index 2a9199e1de75..a20aa3c3be4e 100644
--- a/location/java/android/location/LocationProviderImpl.java
+++ b/location/java/android/location/LocationProviderImpl.java
@@ -249,4 +249,32 @@ public abstract class LocationProviderImpl extends LocationProvider {
     public boolean sendExtraCommand(String command, Bundle extras) {
         return false;
     }
+
+    /**
+     * Informs the location provider when a new client is listening for location information
+     *
+     * @param uid the uid of the client proces
+     */
+    public void addListener(int uid) {
+    }
+
+    /**
+     * Informs the location provider when a client is no longer listening for location information
+     *
+     * @param uid the uid of the client proces
+     */
+    public void removeListener(int uid) {
+    }
+
+    /**
+     * Informs the location provider when the location manager service has acquired its wake lock
+     */
+    public void wakeLockAcquired() {
+    }
+
+    /**
+     * Informs the location provider when the location manager service has released its wake lock
+     */
+    public void wakeLockReleased() {
+    }
 }
diff --git a/location/java/com/android/internal/location/GpsLocationProvider.java b/location/java/com/android/internal/location/GpsLocationProvider.java
index 8a33574eb4aa..924641c8a398 100644
--- a/location/java/com/android/internal/location/GpsLocationProvider.java
+++ b/location/java/com/android/internal/location/GpsLocationProvider.java
@@ -22,20 +22,23 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.location.Criteria;
 import android.location.IGpsStatusListener;
-import android.location.ILocationCollector;
 import android.location.ILocationManager;
 import android.location.Location;
 import android.location.LocationManager;
 import android.location.LocationProvider;
 import android.location.LocationProviderImpl;
+import android.net.ConnectivityManager;
 import android.net.SntpClient;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.os.RemoteException;
+import android.os.ServiceManager;
 import android.os.SystemClock;
 import android.util.Config;
 import android.util.Log;
+import android.util.SparseIntArray;
 
+import com.android.internal.app.IBatteryStats;
 import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.TelephonyIntents;
 
@@ -99,6 +102,14 @@ public class GpsLocationProvider extends LocationProviderImpl {
     private static final int GPS_STATUS_ENGINE_ON = 3;
     private static final int GPS_STATUS_ENGINE_OFF = 4;
 
+    // these need to match GpsSuplStatusValue defines in gps.h
+    /** SUPL status event values. */
+    private static final int GPS_REQUEST_SUPL_DATA_CONN = 1;
+    private static final int GPS_RELEASE_SUPL_DATA_CONN = 2;
+    private static final int GPS_SUPL_DATA_CONNECTED = 3;
+    private static final int GPS_SUPL_DATA_CONN_DONE = 4;
+    private static final int GPS_SUPL_DATA_CONN_FAILED = 5;
+
     // these need to match GpsLocationFlags enum in gps.h
     private static final int LOCATION_INVALID = 0;
     private static final int LOCATION_HAS_LAT_LONG = 1;
@@ -122,6 +133,11 @@ public class GpsLocationProvider extends LocationProviderImpl {
     private static final int GPS_DELETE_CELLDB_INFO = 0x8000;
     private static final int GPS_DELETE_ALL = 0xFFFF;
 
+    // for mSuplDataConnectionState
+    private static final int SUPL_DATA_CONNECTION_CLOSED = 0;
+    private static final int SUPL_DATA_CONNECTION_OPENING = 1;
+    private static final int SUPL_DATA_CONNECTION_OPEN = 2;
+
     private static final String PROPERTIES_FILE = "/etc/gps.conf";
 
     private int mLocationFlags = LOCATION_INVALID;
@@ -176,6 +192,12 @@ public class GpsLocationProvider extends LocationProviderImpl {
     private String mSuplHost;
     private int mSuplPort;
     private boolean mSetSuplServer;
+    private String mSuplApn;
+    private int mSuplDataConnectionState;
+    private final ConnectivityManager mConnMgr;
+
+    private final IBatteryStats mBatteryStats;
+    private final SparseIntArray mClientUids = new SparseIntArray();
 
     // how often to request NTP time, in milliseconds
     // current setting 4 hours
@@ -184,8 +206,6 @@ public class GpsLocationProvider extends LocationProviderImpl {
     // current setting - 5 minutes
     private static final long RETRY_INTERVAL = 5*60*1000; 
 
-    private ILocationCollector mCollector;
-
     private class TelephonyBroadcastReceiver extends BroadcastReceiver {
         @Override public void onReceive(Context context, Intent intent) {
             String action = intent.getAction();
@@ -198,10 +218,12 @@ public class GpsLocationProvider extends LocationProviderImpl {
                 if (Config.LOGD) {
                     Log.d(TAG, "state: " + state +  " apnName: " + apnName + " reason: " + reason);
                 }
-                if ("CONNECTED".equals(state)) {
-                    native_set_supl_apn(apnName);
-                } else {
-                    native_set_supl_apn("");
+                if ("CONNECTED".equals(state) && apnName != null && apnName.length() > 0) {
+                    mSuplApn = apnName;
+                    if (mSuplDataConnectionState == SUPL_DATA_CONNECTION_OPENING) {
+                        native_supl_data_conn_open(mSuplApn);
+                        mSuplDataConnectionState = SUPL_DATA_CONNECTION_OPEN;
+                    }
                 }
             }
         }
@@ -220,6 +242,11 @@ public class GpsLocationProvider extends LocationProviderImpl {
         intentFilter.addAction(TelephonyIntents.ACTION_ANY_DATA_CONNECTION_STATE_CHANGED);
         context.registerReceiver(receiver, intentFilter);
 
+        mConnMgr = (ConnectivityManager)context.getSystemService(Context.CONNECTIVITY_SERVICE);
+
+        // Battery statistics service to be notified when GPS turns on or off
+        mBatteryStats = IBatteryStats.Stub.asInterface(ServiceManager.getService("batteryinfo"));
+
         mProperties = new Properties();
         try {
             File file = new File(PROPERTIES_FILE);
@@ -242,10 +269,6 @@ public class GpsLocationProvider extends LocationProviderImpl {
         }
     }
 
-    public void setLocationCollector(ILocationCollector collector) {
-        mCollector = collector;
-    }
-
     /**
      * Returns true if the provider requires access to a
      * data network (e.g., the Internet), false otherwise.
@@ -547,6 +570,30 @@ public class GpsLocationProvider extends LocationProviderImpl {
     }
 
     @Override
+    public void addListener(int uid) {
+        mClientUids.put(uid, 0);
+        if (mNavigating) {
+            try {
+                mBatteryStats.noteStartGps(uid);
+            } catch (RemoteException e) {
+                Log.w(TAG, "RemoteException in addListener");
+            }
+        }
+    }
+
+    @Override
+    public void removeListener(int uid) {
+        mClientUids.delete(uid);
+        if (mNavigating) {
+            try {
+                mBatteryStats.noteStopGps(uid);
+            } catch (RemoteException e) {
+                Log.w(TAG, "RemoteException in removeListener");
+            }
+        }
+    }
+
+    @Override
     public boolean sendExtraCommand(String command, Bundle extras) {
         
         if ("delete_aiding_data".equals(command)) {
@@ -675,16 +722,6 @@ public class GpsLocationProvider extends LocationProviderImpl {
             }
 
             reportLocationChanged(mLocation);
-
-            // Send to collector
-            if ((flags & LOCATION_HAS_LAT_LONG) == LOCATION_HAS_LAT_LONG
-                    && mCollector != null) {
-                try {
-                    mCollector.updateLocation(mLocation);
-                } catch (RemoteException e) {
-                    Log.w(TAG, "mCollector.updateLocation failed");
-                }
-            }
         }
 
         if (mStarted && mStatus != AVAILABLE) {
@@ -725,6 +762,20 @@ public class GpsLocationProvider extends LocationProviderImpl {
                 }
             }
 
+            try {
+                // update battery stats
+                for (int i=mClientUids.size() - 1; i >= 0; i--) {
+                    int uid = mClientUids.keyAt(i);
+                    if (mNavigating) {
+                        mBatteryStats.noteStartGps(uid);
+                    } else {
+                        mBatteryStats.noteStopGps(uid);
+                    }
+                }
+            } catch (RemoteException e) {
+                Log.w(TAG, "RemoteException in reportStatus");
+            }
+
             // send an intent to notify that the GPS has been enabled or disabled.
             Intent intent = new Intent(GPS_ENABLED_CHANGE_ACTION);
             intent.putExtra(EXTRA_ENABLED, mNavigating);
@@ -782,7 +833,44 @@ public class GpsLocationProvider extends LocationProviderImpl {
             updateStatus(TEMPORARILY_UNAVAILABLE, mSvCount);
         }
     }
-    
+
+    /**
+     * called from native code to update SUPL status
+     */
+    private void reportSuplStatus(int status) {
+        switch (status) {
+            case GPS_REQUEST_SUPL_DATA_CONN:
+                 int result = mConnMgr.startUsingNetworkFeature(
+                        ConnectivityManager.TYPE_MOBILE, Phone.FEATURE_ENABLE_SUPL);
+                if (result == Phone.APN_ALREADY_ACTIVE) {
+                    native_supl_data_conn_open(mSuplApn);
+                    mSuplDataConnectionState = SUPL_DATA_CONNECTION_OPEN;
+                } else if (result == Phone.APN_REQUEST_STARTED) {
+                    mSuplDataConnectionState = SUPL_DATA_CONNECTION_OPENING;
+                } else {
+                    native_supl_data_conn_failed();
+                }
+                break;
+            case GPS_RELEASE_SUPL_DATA_CONN:
+                if (mSuplDataConnectionState != SUPL_DATA_CONNECTION_CLOSED) {
+                    mConnMgr.stopUsingNetworkFeature(
+                            ConnectivityManager.TYPE_MOBILE, Phone.FEATURE_ENABLE_SUPL);
+                    native_supl_data_conn_closed();
+                    mSuplDataConnectionState = SUPL_DATA_CONNECTION_CLOSED;
+                }
+                break;
+            case GPS_SUPL_DATA_CONNECTED:
+                // Log.d(TAG, "GPS_SUPL_DATA_CONNECTED");
+                break;
+            case GPS_SUPL_DATA_CONN_DONE:
+                // Log.d(TAG, "GPS_SUPL_DATA_CONN_DONE");
+                break;
+            case GPS_SUPL_DATA_CONN_FAILED:
+                // Log.d(TAG, "GPS_SUPL_DATA_CONN_FAILED");
+                break;
+        }
+    }
+
     private void xtraDownloadRequest() {
         if (Config.LOGD) Log.d(TAG, "xtraDownloadRequest");
         if (mNetworkThread != null) {
@@ -1002,6 +1090,8 @@ public class GpsLocationProvider extends LocationProviderImpl {
     private native void native_inject_xtra_data(byte[] data, int length);
 
     // SUPL Support    
+    private native void native_supl_data_conn_open(String apn);
+    private native void native_supl_data_conn_closed();
+    private native void native_supl_data_conn_failed();
     private native void native_set_supl_server(int addr, int port);
-    private native void native_set_supl_apn(String apn);
 }
diff --git a/location/java/com/android/internal/location/LocationProviderProxy.java b/location/java/com/android/internal/location/LocationProviderProxy.java
index 1f4940fed085..72dd07d9d6e8 100644
--- a/location/java/com/android/internal/location/LocationProviderProxy.java
+++ b/location/java/com/android/internal/location/LocationProviderProxy.java
@@ -222,52 +222,35 @@ public class LocationProviderProxy extends LocationProviderImpl {
         }
     }
 
-    public void updateCellLockStatus(boolean acquired) {
+    public void addListener(int uid) {
         try {
-            mProvider.updateCellLockStatus(acquired);
-        } catch (RemoteException e) {
-            Log.e(TAG, "updateCellLockStatus failed", e);
-        }
-    }
-
-    public void addListener(String[] applications) {
-        try {
-            mProvider.addListener(applications);
+            mProvider.addListener(uid);
         } catch (RemoteException e) {
             Log.e(TAG, "addListener failed", e);
         }
     }
 
-    public void removeListener(String[] applications) {
+    public void removeListener(int uid) {
         try {
-            mProvider.removeListener(applications);
+            mProvider.removeListener(uid);
         } catch (RemoteException e) {
             Log.e(TAG, "removeListener failed", e);
         }
     }
 
-    public String getFromLocation(double latitude, double longitude, int maxResults,
-        String language, String country, String variant, String appName, List<Address> addrs) {
+    public void wakeLockAcquired() {
         try {
-            return mProvider.getFromLocation(latitude, longitude, maxResults, language, country, 
-                    variant, appName,  addrs);
+            mProvider.wakeLockAcquired();
         } catch (RemoteException e) {
-            Log.e(TAG, "getFromLocation failed", e);
-            return null;
+            Log.e(TAG, "wakeLockAcquired failed", e);
         }
     }
 
-    public String getFromLocationName(String locationName,
-        double lowerLeftLatitude, double lowerLeftLongitude,
-        double upperRightLatitude, double upperRightLongitude, int maxResults,
-        String language, String country, String variant, String appName, List<Address> addrs) {
+    public void wakeLockReleased() {
         try {
-            return mProvider.getFromLocationName(locationName, lowerLeftLatitude, 
-                    lowerLeftLongitude, upperRightLatitude, upperRightLongitude,
-                    maxResults, language, country, variant, appName, addrs);
+            mProvider.wakeLockReleased();
         } catch (RemoteException e) {
-            Log.e(TAG, "getFromLocationName failed", e);
-            return null;
+            Log.e(TAG, "wakeLockReleased failed", e);
         }
     }
 }
diff --git a/media/java/android/media/AudioRecord.java b/media/java/android/media/AudioRecord.java
index a49bd67b772a..3346bed93e30 100644
--- a/media/java/android/media/AudioRecord.java
+++ b/media/java/android/media/AudioRecord.java
@@ -40,7 +40,7 @@ import android.util.Log;
  * <p>Upon creation, an AudioRecord object initializes its associated audio buffer that it will
  * fill with the new audio data. The size of this buffer, specified during the construction, 
  * determines how long an AudioRecord can record before "over-running" data that has not
- * been read yet. Data should be from the audio hardware in chunks of sizes inferior to
+ * been read yet. Data should be read from the audio hardware in chunks of sizes inferior to
  * the total recording buffer size.
  */
 public class AudioRecord
@@ -49,20 +49,20 @@ public class AudioRecord
     // Constants
     //--------------------
     /**
-     *  State of an AudioRecord that was not successfully initialized upon creation 
+     *  indicates AudioRecord state is not successfully initialized. 
      */
     public static final int STATE_UNINITIALIZED = 0;
     /**
-     *  State of an AudioRecord that is ready to be used 
+     *  indicates AudioRecord state is ready to be used 
      */
     public static final int STATE_INITIALIZED   = 1;
 
     /**
-     * State of an AudioRecord this is not recording 
+     * indicates AudioRecord recording state is not recording 
      */
     public static final int RECORDSTATE_STOPPED = 1;  // matches SL_RECORDSTATE_STOPPED
     /**
-     * State of an AudioRecord this is recording 
+     * indicates AudioRecord recording state is recording 
      */
     public static final int RECORDSTATE_RECORDING = 3;// matches SL_RECORDSTATE_RECORDING
 
@@ -94,11 +94,11 @@ public class AudioRecord
     // Events:
     // to keep in sync with frameworks/base/include/media/AudioRecord.h 
     /**
-     * Event id for when the recording head has reached a previously set marker.
+     * Event id denotes when record head has reached a previously set marker.
      */
     private static final int NATIVE_EVENT_MARKER  = 2;
     /**
-     * Event id for when the previously set update period has passed during recording.
+     * Event id denotes when previously set update period has elapsed during recording.
      */
     private static final int NATIVE_EVENT_NEW_POS = 3;
     
@@ -188,7 +188,7 @@ public class AudioRecord
      */
     private int mNativeBufferSizeInBytes = 0;
 
-    
+
     //---------------------------------------------------------
     // Constructor, Finalize
     //--------------------
@@ -206,7 +206,9 @@ public class AudioRecord
      *   {@link AudioFormat#ENCODING_PCM_8BIT}
      * @param bufferSizeInBytes the total size (in bytes) of the buffer where audio data is written
      *   to during the recording. New audio data can be read from this buffer in smaller chunks 
-     *   than this size.
+     *   than this size. See {@link #getMinBufferSize(int, int, int)} to determine the minimum
+     *   required buffer size for the successful creation of an AudioRecord instance. Using values
+     *   smaller than getMinBufferSize() will result in an initialization failure.
      * @throws java.lang.IllegalArgumentException
      */
     public AudioRecord(int audioSource, int sampleRateInHz, int channelConfig, int audioFormat, 
@@ -319,11 +321,13 @@ public class AudioRecord
 
         mNativeBufferSizeInBytes = audioBufferSize;
     }    
-    
-    
+
+
 
     /**
      * Releases the native AudioRecord resources.
+     * The object can no longer be used and the reference should be set to null
+     * after a call to release()
      */
     public void release() {
         try {
@@ -334,7 +338,7 @@ public class AudioRecord
         native_release();
         mState = STATE_UNINITIALIZED;
     }
-    
+
 
     @Override
     protected void finalize() {
@@ -404,24 +408,27 @@ public class AudioRecord
     public int getRecordingState() {
         return mRecordingState;
     }
-    
+
     /**
-     * @return marker position in frames
+     * Returns the notification marker position expressed in frames.
      */
     public int getNotificationMarkerPosition() {
         return native_get_marker_pos();
     }
 
     /**
-     * @return update period in frames
+     * Returns the notification update period expressed in frames.
      */
     public int getPositionNotificationPeriod() {
         return native_get_pos_update_period();
     }
-    
+
     /**
      * Returns the minimum buffer size required for the successful creation of an AudioRecord
      * object.
+     * Note that this size doesn't guarantee a smooth recording under load, and higher values
+     * should be chosen according to the expected frequency at which the AudioRecord instance
+     * will be polled for new data.
      * @param sampleRateInHz the sample rate expressed in Hertz.
      * @param channelConfig describes the configuration of the audio channels. 
      *   See {@link AudioFormat#CHANNEL_CONFIGURATION_MONO} and
@@ -432,7 +439,7 @@ public class AudioRecord
      *  hardware, or an invalid parameter was passed,
      *  or {@link #ERROR} if the implementation was unable to query the hardware for its 
      *  output properties, 
-     *   or the minimum buffer size expressed in of bytes.
+     *   or the minimum buffer size expressed in bytes.
      */
     static public int getMinBufferSize(int sampleRateInHz, int channelConfig, int audioFormat) {
         int channelCount = 0;
@@ -516,7 +523,7 @@ public class AudioRecord
     /**
      * Reads audio data from the audio hardware for recording into a buffer.
      * @param audioData the array to which the recorded audio data is written.
-     * @param offsetInBytes index in audioData from which the data is written.
+     * @param offsetInBytes index in audioData from which the data is written expressed in bytes.
      * @param sizeInBytes the number of requested bytes.
      * @return the number of bytes that were read or or {@link #ERROR_INVALID_OPERATION}
      *    if the object wasn't properly initialized, or {@link #ERROR_BAD_VALUE} if
@@ -540,9 +547,9 @@ public class AudioRecord
     /**
      * Reads audio data from the audio hardware for recording into a buffer.
      * @param audioData the array to which the recorded audio data is written.
-     * @param offsetInShorts index in audioData from which the data is written.
+     * @param offsetInShorts index in audioData from which the data is written expressed in shorts.
      * @param sizeInShorts the number of requested shorts.
-     * @return the number of bytes that were read or or {@link #ERROR_INVALID_OPERATION}
+     * @return the number of shorts that were read or or {@link #ERROR_INVALID_OPERATION}
      *    if the object wasn't properly initialized, or {@link #ERROR_BAD_VALUE} if
      *    the parameters don't resolve to valid data and indexes.
      *    The number of shorts will not exceed sizeInShorts.
@@ -595,8 +602,15 @@ public class AudioRecord
     public void setRecordPositionUpdateListener(OnRecordPositionUpdateListener listener) {
         setRecordPositionUpdateListener(listener, null);
     }
-    
 
+    /**
+     * Sets the listener the AudioRecord notifies when a previously set marker is reached or
+     * for each periodic record head position update.
+     * Use this method to receive AudioRecord events in the Handler associated with another
+     * thread than the one in which you created the AudioTrack instance.
+     * @param listener
+     * @param handler the Handler that will receive the event notification messages.
+     */
     public void setRecordPositionUpdateListener(OnRecordPositionUpdateListener listener, 
                                                     Handler handler) {
         synchronized (mPositionListenerLock) {
@@ -616,8 +630,8 @@ public class AudioRecord
         }
         
     }
-    
-    
+
+
     /**
      * Sets the marker position at which the listener is called, if set with 
      * {@link #setRecordPositionUpdateListener(OnRecordPositionUpdateListener)} or 
@@ -629,8 +643,8 @@ public class AudioRecord
     public int setNotificationMarkerPosition(int markerInFrames) {
         return native_set_marker_pos(markerInFrames);
     }
-    
-    
+
+
     /**
      * Sets the period at which the listener is called, if set with
      * {@link #setRecordPositionUpdateListener(OnRecordPositionUpdateListener)} or 
@@ -648,7 +662,9 @@ public class AudioRecord
     //--------------------
     /**
      * Interface definition for a callback to be invoked when an AudioRecord has
-     * reached a notification marker set by setNotificationMarkerPosition().
+     * reached a notification marker set by {@link AudioRecord#setNotificationMarkerPosition(int)}
+     * or for periodic updates on the progress of the record head, as set by
+     * {@link AudioRecord#setPositionNotificationPeriod(int)}.
      */
     public interface OnRecordPositionUpdateListener  {
         /**
@@ -663,10 +679,9 @@ public class AudioRecord
          */
         void onPeriodicNotification(AudioRecord recorder);
     }
-    
-    
 
-    
+
+
     //---------------------------------------------------------
     // Inner classes
     //--------------------
@@ -678,12 +693,12 @@ public class AudioRecord
     private class NativeEventHandler extends Handler {
         
         private final AudioRecord mAudioRecord;
-        
+
         NativeEventHandler(AudioRecord recorder, Looper looper) {
             super(looper);
             mAudioRecord = recorder;
         }
-        
+
         @Override
         public void handleMessage(Message msg) {
             OnRecordPositionUpdateListener listener = null;
@@ -779,7 +794,3 @@ public class AudioRecord
 
 }
 
-
-
-
-
diff --git a/media/java/android/media/AudioSystem.java b/media/java/android/media/AudioSystem.java
index d0fa7953dd21..5917ab90e6c7 100644
--- a/media/java/android/media/AudioSystem.java
+++ b/media/java/android/media/AudioSystem.java
@@ -200,7 +200,7 @@ public class AudioSystem
          * param error   error code:
          * - AUDIO_STATUS_OK
          * - AUDIO_STATUS_SERVER_DIED
-         * - UDIO_STATUS_ERROR
+         * - AUDIO_STATUS_ERROR
          */
         void onError(int error);
     };
diff --git a/media/java/android/media/AudioTrack.java b/media/java/android/media/AudioTrack.java
index 4196ef398b65..3cd841de4145 100644
--- a/media/java/android/media/AudioTrack.java
+++ b/media/java/android/media/AudioTrack.java
@@ -32,22 +32,24 @@ import android.util.Log;
  * It allows to stream PCM audio buffers to the audio hardware for playback. This is
  * achieved by "pushing" the data to the AudioTrack object using one of the
  *  {@link #write(byte[], int, int)} and {@link #write(short[], int, int)} methods.
- * <p>An AudioTrack instance can operate under two modes: static of streaming.<br>
- * The Streaming mode consists in continuously writing data to the AudioTrack, using one
- * of the write() methods. These are blocking and return when the data has been transferred
- * from the Java layer to the native layer, and is queued for playback. The streaming mode
+ *  
+ * <p>An AudioTrack instance can operate under two modes: static or streaming.<br>
+ * In Streaming mode, the application writes a continuous stream of data to the AudioTrack, using
+ * one of the write() methods. These are blocking and return when the data has been transferred
+ * from the Java layer to the native layer and queued for playback. The streaming mode
  *  is most useful when playing blocks of audio data that for instance are:
  * <ul>
  *   <li>too big to fit in memory because of the duration of the sound to play,</li>
  *   <li>too big to fit in memory because of the characteristics of the audio data
  *         (high sampling rate, bits per sample ...)</li>
- *   <li>chosen, received or generated as the audio keeps playing.</li>
+ *   <li>received or generated while previously queued audio is playing.</li>
  * </ul>
  * The static mode is to be chosen when dealing with short sounds that fit in memory and
- * that need to be played with the smallest latency possible. Static mode AudioTrack instances can
- * play the sound without the need to transfer the audio data from Java to the audio hardware
+ * that need to be played with the smallest latency possible. AudioTrack instances in static mode
+ * can play the sound without the need to transfer the audio data from Java to native layer
  * each time the sound is to be played. The static mode will therefore be preferred for UI and
  * game sounds that are played often, and with the smallest overhead possible.
+ * 
  * <p>Upon creation, an AudioTrack object initializes its associated audio buffer.
  * The size of this buffer, specified during the construction, determines how long an AudioTrack
  * can play before running out of data.<br>
@@ -66,11 +68,11 @@ public class AudioTrack
     /** Maximum value for a channel volume */
     private static final float VOLUME_MAX = 1.0f;
 
-    /** state of an AudioTrack this is stopped */
+    /** indicates AudioTrack state is stopped */
     public static final int PLAYSTATE_STOPPED = 1;  // matches SL_PLAYSTATE_STOPPED
-    /** state of an AudioTrack this is paused */
+    /** indicates AudioTrack state is paused */
     public static final int PLAYSTATE_PAUSED  = 2;  // matches SL_PLAYSTATE_PAUSED
-    /** state of an AudioTrack this is playing */
+    /** indicates AudioTrack state is playing */
     public static final int PLAYSTATE_PLAYING = 3;  // matches SL_PLAYSTATE_PLAYING
 
     /**
@@ -85,7 +87,7 @@ public class AudioTrack
     public static final int MODE_STREAM = 1;
 
     /**
-     * State of an AudioTrack that was not successfully initialized upon creation
+     * State of an AudioTrack that was not successfully initialized upon creation.
      */
     public static final int STATE_UNINITIALIZED = 0;
     /**
@@ -126,11 +128,11 @@ public class AudioTrack
     // Events:
     // to keep in sync with frameworks/base/include/media/AudioTrack.h
     /**
-     * Event id for when the playback head has reached a previously set marker.
+     * Event id denotes when playback head has reached a previously set marker.
      */
     private static final int NATIVE_EVENT_MARKER  = 3;
     /**
-     * Event id for when the previously set update period has passed during playback.
+     * Event id denotes when previously set update period has elapsed during playback.
      */
     private static final int NATIVE_EVENT_NEW_POS = 4;
 
@@ -141,11 +143,11 @@ public class AudioTrack
     // Member variables
     //--------------------
     /**
-     * Indicates the state of the AudioTrack instance
+     * Indicates the state of the AudioTrack instance.
      */
     private int mState = STATE_UNINITIALIZED;
     /**
-     * Indicates the play state of the AudioTrack instance
+     * Indicates the play state of the AudioTrack instance.
      */
     private int mPlayState = PLAYSTATE_STOPPED;
     /**
@@ -159,7 +161,7 @@ public class AudioTrack
      */
     private OnPlaybackPositionUpdateListener mPositionListener = null;
     /**
-     * Lock to protect event listener updates against event notifications
+     * Lock to protect event listener updates against event notifications.
      */
     private final Object mPositionListenerLock = new Object();
     /**
@@ -167,11 +169,11 @@ public class AudioTrack
      */
     private int mNativeBufferSizeInBytes = 0;
     /**
-     * Handler for marker events coming from the native code
+     * Handler for marker events coming from the native code.
      */
     private NativeEventHandlerDelegate mEventHandlerDelegate = null;
     /**
-     * Looper associated with the thread that creates the AudioTrack instance
+     * Looper associated with the thread that creates the AudioTrack instance.
      */
     private Looper mInitializationLooper = null;
     /**
@@ -179,7 +181,7 @@ public class AudioTrack
      */
     private int mSampleRate = 22050;
     /**
-     * The number of input audio channels (1 is mono, 2 is stereo)
+     * The number of input audio channels (1 is mono, 2 is stereo).
      */
     private int mChannelCount = 1;
     /**
@@ -194,7 +196,7 @@ public class AudioTrack
      */
     private int mDataLoadMode = MODE_STREAM;
     /**
-     * The current audio channel configuration
+     * The current audio channel configuration.
      */
     private int mChannelConfiguration = AudioFormat.CHANNEL_CONFIGURATION_MONO;
     /**
@@ -209,7 +211,7 @@ public class AudioTrack
     // Used exclusively by native code
     //--------------------
     /**
-     * Accessed by native methods: provides access to C++ AudioTrack object
+     * Accessed by native methods: provides access to C++ AudioTrack object.
      */
     @SuppressWarnings("unused")
     private int mNativeTrackInJavaObj;
@@ -227,17 +229,14 @@ public class AudioTrack
     /**
      * Class constructor.
      * @param streamType the type of the audio stream. See
-
      *   {@link AudioManager#STREAM_VOICE_CALL}, {@link AudioManager#STREAM_SYSTEM},
      *   {@link AudioManager#STREAM_RING}, {@link AudioManager#STREAM_MUSIC} and
      *   {@link AudioManager#STREAM_ALARM}
      * @param sampleRateInHz the sample rate expressed in Hertz. Examples of rates are (but
      *   not limited to) 44100, 22050 and 11025.
      * @param channelConfig describes the configuration of the audio channels.
-
      *   See {@link AudioFormat#CHANNEL_CONFIGURATION_MONO} and
      *   {@link AudioFormat#CHANNEL_CONFIGURATION_STEREO}
-
      * @param audioFormat the format in which the audio data is represented.
      *   See {@link AudioFormat#ENCODING_PCM_16BIT} and
      *   {@link AudioFormat#ENCODING_PCM_8BIT}
@@ -245,6 +244,9 @@ public class AudioTrack
      *   from for playback. If using the AudioTrack in streaming mode, you can write data into
      *   this buffer in smaller chunks than this size. If using the AudioTrack in static mode,
      *   this is the maximum size of the sound that will be played for this instance.
+     *   See {@link #getMinBufferSize(int, int, int)} to determine the minimum required buffer size
+     *   for the successful creation of an AudioTrack instance in streaming mode. Using values
+     *   smaller than getMinBufferSize() will result in an initialization failure.
      * @param mode streaming or static buffer. See {@link #MODE_STATIC} and {@link #MODE_STREAM}
      * @throws java.lang.IllegalArgumentException
      */
@@ -423,8 +425,8 @@ public class AudioTrack
     }
     
     /**
-     * Returns the current playback rate in Hz. Note that this rate may differ from one set using
-     * {@link #setPlaybackRate(int)} as the value effectively set is implementation-dependent.
+     * Returns the current playback rate in Hz. Note that this rate may differ from the one set
+     * with {@link #setPlaybackRate(int)} as the value effectively used is implementation-dependent.
      */
     public int getPlaybackRate() {
         return native_get_playback_rate();
@@ -470,6 +472,9 @@ public class AudioTrack
      * AudioTrack instance has been created to check if it was initialized
      * properly. This ensures that the appropriate hardware resources have been
      * acquired.
+     * @see #STATE_INITIALIZED
+     * @see #STATE_NO_STATIC_DATA
+     * @see #STATE_UNINITIALIZED
      */
     public int getState() {
         return mState;
@@ -486,28 +491,28 @@ public class AudioTrack
     }
 
     /**
-     *  Returns the native frame count used by the hardware
+     *  Returns the native frame count used by the hardware.
      */
     protected int getNativeFrameCount() {
         return native_get_native_frame_count();
     }
 
     /**
-     * @return marker position in frames
+     * Returns marker position expressed in frames.
      */
     public int getNotificationMarkerPosition() {
         return native_get_marker_pos();
     }
 
     /**
-     * @return update period in frames
+     * Returns the notification update period expressed in frames.
      */
     public int getPositionNotificationPeriod() {
         return native_get_pos_update_period();
     }
 
     /**
-     * @return playback head position in frames
+     * Returns the playback head position expressed in frames
      */
     public int getPlaybackHeadPosition() {
         return native_get_position();
@@ -522,7 +527,9 @@ public class AudioTrack
     
     /**
      * Returns the minimum buffer size required for the successful creation of an AudioTrack
-     * object to be created in the {@link #MODE_STREAM} mode.
+     * object to be created in the {@link #MODE_STREAM} mode. Note that this size doesn't
+     * guarantee a smooth playback under load, and higher values should be chosen according to
+     * the expected frequency at which the buffer will be refilled with additional data to play. 
      * @param sampleRateInHz the sample rate expressed in Hertz.
      * @param channelConfig describes the configuration of the audio channels. 
      *   See {@link AudioFormat#CHANNEL_CONFIGURATION_MONO} and
@@ -533,7 +540,7 @@ public class AudioTrack
      * @return {@link #ERROR_BAD_VALUE} if an invalid parameter was passed,
      *   or {@link #ERROR} if the implementation was unable to query the hardware for its output 
      *     properties, 
-     *   or the minimum buffer size expressed  in number of bytes.
+     *   or the minimum buffer size expressed in bytes.
      */
     static public int getMinBufferSize(int sampleRateInHz, int channelConfig, int audioFormat) {
         int channelCount = 0;
@@ -577,13 +584,22 @@ public class AudioTrack
     /**
      * Sets the listener the AudioTrack notifies when a previously set marker is reached or
      * for each periodic playback head position update.
+     * Notifications will be received in the same thread as the one in which the AudioTrack
+     * instance was created.
      * @param listener
      */
     public void setPlaybackPositionUpdateListener(OnPlaybackPositionUpdateListener listener) {
         setPlaybackPositionUpdateListener(listener, null);
     }
     
-
+    /**
+     * Sets the listener the AudioTrack notifies when a previously set marker is reached or
+     * for each periodic playback head position update.
+     * Use this method to receive AudioTrack events in the Handler associated with another
+     * thread than the one in which you created the AudioTrack instance.
+     * @param listener
+     * @param handler the Handler that will receive the event notification messages.
+     */
     public void setPlaybackPositionUpdateListener(OnPlaybackPositionUpdateListener listener, 
                                                     Handler handler) {
         synchronized (mPositionListenerLock) {
@@ -636,13 +652,17 @@ public class AudioTrack
      * the audio data will be consumed and played back, not the original sampling rate of the
      * content. Setting it to half the sample rate of the content will cause the playback to
      * last twice as long, but will also result result in a negative pitch shift.
-     * The current implementation supports a maximum sample rate of twice the hardware output
-     * sample rate (see {@link #getNativeOutputSampleRate(int)}). Use {@link #getSampleRate()} to
-     * check the rate actually used in hardware after potential clamping.
-     * @param sampleRateInHz
+     * The current implementation supports a maximum sample rate of 64kHz.
+     * Use {@link #getSampleRate()} to check the rate actually used in hardware after 
+     * potential clamping.
+     * @param sampleRateInHz the sample rate expressed in Hz
      * @return error code or success, see {@link #SUCCESS}, {@link #ERROR_BAD_VALUE},
      *    {@link #ERROR_INVALID_OPERATION}
      */
+    // FIXME: the implementation should support twice the hardware output sample rate
+    //   (see {@link #getNativeOutputSampleRate(int)}), but currently
+    //  due to the representation of the sample rate in the native layer, the sample rate
+    //  is limited to 65535Hz
     public int setPlaybackRate(int sampleRateInHz) {
         if (mState != STATE_INITIALIZED) {
             return ERROR_INVALID_OPERATION;
@@ -656,7 +676,7 @@ public class AudioTrack
 
 
     /**
-     *
+     * Sets the position of the notification marker.
      * @param markerInFrames marker in frames
      * @return error code or success, see {@link #SUCCESS}, {@link #ERROR_BAD_VALUE},
      *  {@link #ERROR_INVALID_OPERATION}
@@ -670,7 +690,8 @@ public class AudioTrack
 
 
     /**
-     * @param periodInFrames update period in frames
+     * Sets the period for the periodic notification event.
+     * @param periodInFrames update period expressed in frames
      * @return error code or success, see {@link #SUCCESS}, {@link #ERROR_INVALID_OPERATION}
      */
     public int setPositionNotificationPeriod(int periodInFrames) {
@@ -683,7 +704,7 @@ public class AudioTrack
 
     /**
      * Sets the playback head position. The track must be stopped for the position to be changed.
-     * @param positionInFrames playback head position in frames
+     * @param positionInFrames playback head position expressed in frames
      * @return error code or success, see {@link #SUCCESS}, {@link #ERROR_BAD_VALUE},
      *    {@link #ERROR_INVALID_OPERATION}
      */
@@ -699,8 +720,8 @@ public class AudioTrack
 
     /**
      * Sets the loop points and the loop count. The loop can be infinite.
-     * @param startInFrames loop start marker in frames
-     * @param endInFrames loop end marker in frames
+     * @param startInFrames loop start marker expressed in frames
+     * @param endInFrames loop end marker expressed in frames
      * @param loopCount the number of times the loop is looped.
      *    A value of -1 means infinite looping.
      * @return error code or success, see {@link #SUCCESS}, {@link #ERROR_BAD_VALUE},
@@ -797,7 +818,8 @@ public class AudioTrack
     /**
      * Writes the audio data to the audio hardware for playback.
      * @param audioData the array that holds the data to play.
-     * @param offsetInBytes the offset in audioData where the data to play starts.
+     * @param offsetInBytes the offset expressed in bytes in audioData where the data to play 
+     *    starts.
      * @param sizeInBytes the number of bytes to read in audioData after the offset.
      * @return the number of bytes that were written or {@link #ERROR_INVALID_OPERATION}
      *    if the object wasn't properly initialized, or {@link #ERROR_BAD_VALUE} if
@@ -827,7 +849,8 @@ public class AudioTrack
     /**
      * Writes the audio data to the audio hardware for playback.
      * @param audioData the array that holds the data to play.
-     * @param offsetInShorts the offset in audioData where the data to play starts.
+     * @param offsetInShorts the offset expressed in shorts in audioData where the data to play
+     *     starts.
      * @param sizeInShorts the number of bytes to read in audioData after the offset.
      * @return the number of shorts that were written or {@link #ERROR_INVALID_OPERATION}
       *    if the object wasn't properly initialized, or {@link #ERROR_BAD_VALUE} if
diff --git a/media/java/android/media/JetPlayer.java b/media/java/android/media/JetPlayer.java
index c9efac5cdb19..4fb0ead7ff59 100644
--- a/media/java/android/media/JetPlayer.java
+++ b/media/java/android/media/JetPlayer.java
@@ -30,8 +30,29 @@ import android.util.Log;
 
 /**
  * JetPlayer provides access to JET content playback and control.
- * <p>
- * Use <code>JetPlayer.getJetPlayer()</code> to get an instance of this class.
+ * 
+ * <p>Please refer to the JET Creator User Manual for a presentation of the JET interactive
+ * music concept and how to use the JetCreator tool to create content to be player by JetPlayer.
+ * 
+ * <p>Use of the JetPlayer class is based around the playback of a number of JET segments
+ * sequentially added to a playback FIFO queue. The rendering of the MIDI content stored in each
+ * segment can be dynamically affected by two mechanisms:
+ * <ul>
+ * <li>tracks in a segment can be muted or unmuted at any moment, individually or through
+ *    a mask (to change the mute state of multiple tracks at once)</li>
+ * <li>parts of tracks in a segment can be played at predefined points in the segment, in order
+ *    to maintain synchronization with the other tracks in the segment. This is achieved through
+ *    the notion of "clips", which can be triggered at any time, but that will play only at the
+ *    right time, as authored in the corresponding JET file.</li>
+ * </ul>
+ * As a result of the rendering and playback of the JET segments, the user of the JetPlayer instance
+ * can receive notifications from the JET engine relative to:
+ * <ul>
+ * <li>the playback state,</li>
+ * <li>the number of segments left to play in the queue,</li>
+ * <li>application controller events (CC80-83) to mark points in the MIDI segments.</li>
+ * </ul>
+ *  Use {@link #getJetPlayer()} to construct a JetPlayer instance. JetPlayer is a singleton class.
  * 
  */
 public class JetPlayer
@@ -40,7 +61,7 @@ public class JetPlayer
     // Constants
     //------------------------
     /**
-     * The maximum number of simultaneous tracks. Use __link #getMaxTracks()} to
+     * The maximum number of simultaneous tracks. Use {@link #getMaxTracks()} to
      * access this value.
      */
     private static int MAXTRACKS = 32;
@@ -107,6 +128,10 @@ public class JetPlayer
     //--------------------------------------------
     // Constructor, finalize
     //------------------------
+    /**
+     * Factory method for the JetPlayer class.
+     * @return the singleton JetPlayer instance
+     */
     public static JetPlayer getJetPlayer() {
         if (singletonRef == null) {
             singletonRef = new JetPlayer();
@@ -114,7 +139,9 @@ public class JetPlayer
         return singletonRef;
     }
     
-    
+    /**
+     * Cloning a JetPlayer instance is not supported. Calling clone() will generate an exception.
+     */
     public Object clone() throws CloneNotSupportedException {
         // JetPlayer is a singleton class,
         // so you can't clone a JetPlayer instance
@@ -149,6 +176,11 @@ public class JetPlayer
     }
     
     
+    /**
+     * Stops the current JET playback, and releases all associated native resources.
+     * The object can no longer be used and the reference should be set to null
+     * after a call to release().
+     */
     public void release() {
         native_release();
     }
@@ -158,7 +190,7 @@ public class JetPlayer
     // Getters
     //------------------------
     /**
-     * Returns the maximum number of simultaneous MIDI tracks supported by the Jet player
+     * Returns the maximum number of simultaneous MIDI tracks supported by JetPlayer
      */
     public static int getMaxTracks() {
         return JetPlayer.MAXTRACKS;
@@ -168,11 +200,21 @@ public class JetPlayer
     //--------------------------------------------
     // Jet functionality
     //------------------------
+    /**
+     * Loads a .jet file from a given path.
+     * @param path the path to the .jet file, for instance "/sdcard/mygame/music.jet".
+     * @return true if loading the .jet file was successful, false if loading failed.
+     */
     public boolean loadJetFile(String path) {
         return native_loadJetFromFile(path);
     }
     
     
+    /**
+     * Loads a .jet file from an asset file descriptor.
+     * @param afd the asset file descriptor.
+     * @return true if loading the .jet file was successful, false if loading failed.
+     */
     public boolean loadJetFile(AssetFileDescriptor afd) {
         long len = afd.getLength();
         if (len < 0) {
@@ -182,22 +224,54 @@ public class JetPlayer
                 afd.getFileDescriptor(), afd.getStartOffset(), len);
     }
     
-    
+    /**
+     * Closes the resource containing the JET content.
+     * @return true if successfully closed, false otherwise.
+     */
     public boolean closeJetFile() {
         return native_closeJetFile();
     }
     
     
+    /**
+     * Starts playing the JET segment queue.
+     * @return true if rendering and playback is successfully started, false otherwise.
+     */
     public boolean play() {
         return native_playJet();
     }
     
     
+    /**
+     * Pauses the playback of the JET segment queue.
+     * @return true if rendering and playback is successfully paused, false otherwise.
+     */
     public boolean pause() {
         return native_pauseJet();
     }
     
     
+    /**
+     * Queues the specified segment in the JET queue.
+     * @param segmentNum the identifier of the segment.
+     * @param libNum the index of the sound bank associated with the segment. Use -1 to indicate
+     *    that no sound bank (DLS file) is associated with this segment, in which case JET will use
+     *    the General MIDI library.
+     * @param repeatCount the number of times the segment will be repeated. 0 means the segment will
+     *    only play once. -1 means the segment will repeat indefinitely.
+     * @param transpose the amount of pitch transposition. Set to 0 for normal playback. 
+     *    Range is -12 to +12.
+     * @param muteFlags a bitmask to specify which MIDI tracks will be muted during playback. Bit 0
+     *    affects track 0, bit 1 affects track 1 etc.
+     * @param userID a value specified by the application that uniquely identifies the segment. 
+     *    this value is received in the
+     *    {@link OnJetEventListener#onJetUserIdUpdate(JetPlayer, int, int)} event listener method.
+     *    Normally, the application will keep a byte value that is incremented each time a new
+     *    segment is queued up. This can be used to look up any special characteristics of that
+     *    track including trigger clips and mute flags.
+     * @return true if the segment was successfully queued, false if the queue is full or if the
+     *    parameters are invalid.
+     */
     public boolean queueJetSegment(int segmentNum, int libNum, int repeatCount,
         int transpose, int muteFlags, byte userID) {
         return native_queueJetSegment(segmentNum, libNum, repeatCount, 
@@ -205,6 +279,28 @@ public class JetPlayer
     }
     
     
+    /**
+     * Queues the specified segment in the JET queue.
+     * @param segmentNum the identifier of the segment.
+     * @param libNum the index of the soundbank associated with the segment. Use -1 to indicate that
+     *    no sound bank (DLS file) is associated with this segment, in which case JET will use
+     *    the General MIDI library.
+     * @param repeatCount the number of times the segment will be repeated. 0 means the segment will
+     *    only play once. -1 means the segment will repeat indefinitely.
+     * @param transpose the amount of pitch transposition. Set to 0 for normal playback. 
+     *    Range is -12 to +12.
+     * @param muteArray an array of booleans to specify which MIDI tracks will be muted during
+     *    playback. The value at index 0 affects track 0, value at index 1 affects track 1 etc. 
+     *    The length of the array must be {@link #getMaxTracks()} for the call to succeed.
+     * @param userID a value specified by the application that uniquely identifies the segment. 
+     *    this value is received in the
+     *    {@link OnJetEventListener#onJetUserIdUpdate(JetPlayer, int, int)} event listener method.
+     *    Normally, the application will keep a byte value that is incremented each time a new
+     *    segment is queued up. This can be used to look up any special characteristics of that
+     *    track including trigger clips and mute flags.
+     * @return true if the segment was successfully queued, false if the queue is full or if the
+     *    parameters are invalid.
+     */
     public boolean queueJetSegmentMuteArray(int segmentNum, int libNum, int repeatCount,
             int transpose, boolean[] muteArray, byte userID) {
         if (muteArray.length != JetPlayer.getMaxTracks()) {
@@ -215,11 +311,32 @@ public class JetPlayer
     }
     
     
+    /**
+     * Modifies the mute flags.
+     * @param muteFlags a bitmask to specify which MIDI tracks are muted. Bit 0 affects track 0,
+     *    bit 1 affects track 1 etc.
+     * @param sync if false, the new mute flags will be applied as soon as possible by the JET
+     *    render and playback engine. If true, the mute flags will be updated at the start of the
+     *    next segment. If the segment is repeated, the flags will take effect the next time 
+     *    segment is repeated.
+     * @return true if the mute flags were successfully updated, false otherwise.
+     */
     public boolean setMuteFlags(int muteFlags, boolean sync) {
         return native_setMuteFlags(muteFlags, sync);
     }
     
     
+    /**
+     * Modifies the mute flags for the current active segment.
+     * @param muteArray an array of booleans to specify which MIDI tracks are muted. The value at
+     *    index 0 affects track 0, value at index 1 affects track 1 etc. 
+     *    The length of the array must be {@link #getMaxTracks()} for the call to succeed.
+     * @param sync if false, the new mute flags will be applied as soon as possible by the JET
+     *    render and playback engine. If true, the mute flags will be updated at the start of the
+     *    next segment. If the segment is repeated, the flags will take effect the next time 
+     *    segment is repeated.
+     * @return true if the mute flags were successfully updated, false otherwise.
+     */
     public boolean setMuteArray(boolean[] muteArray, boolean sync) {
         if(muteArray.length != JetPlayer.getMaxTracks())
             return false;
@@ -227,16 +344,41 @@ public class JetPlayer
     }
     
     
+    /**
+     * Mutes or unmutes a single track.
+     * @param trackId the index of the track to mute.
+     * @param muteFlag set to true to mute, false to unmute.
+     * @param sync if false, the new mute flags will be applied as soon as possible by the JET
+     *    render and playback engine. If true, the mute flag will be updated at the start of the
+     *    next segment. If the segment is repeated, the flag will take effect the next time 
+     *    segment is repeated.
+     * @return true if the mute flag was successfully updated, false otherwise.
+     */
     public boolean setMuteFlag(int trackId, boolean muteFlag, boolean sync) {
         return native_setMuteFlag(trackId, muteFlag, sync);
     }
     
     
+    /**
+     * Schedules the playback of a clip.
+     * This will automatically update the mute flags in sync with the JET Clip Marker (controller 
+     * 103). The parameter clipID must be in the range of 0-63. After the call to triggerClip, when
+     * JET next encounters a controller event 103 with bits 0-5 of the value equal to clipID and 
+     * bit 6 set to 1, it will automatically unmute the track containing the controller event.
+     * When JET encounters the complementary controller event 103 with bits 0-5 of the value equal
+     * to clipID and bit 6 set to 0, it will mute the track again.
+     * @param clipId the identifier of the clip to trigger.
+     * @return true if the clip was successfully triggered, false otherwise.
+     */
     public boolean triggerClip(int clipId) {
         return native_triggerClip(clipId);
     }
     
     
+    /**
+     * Empties the segment queue, and clears all clips that are scheduled for playback.
+     * @return true if the queue was successfully cleared, false otherwise.
+     */
     public boolean clearQueue() {
         return native_clearQueue();
     }
@@ -302,10 +444,25 @@ public class JetPlayer
     //--------------------------------------------
     // Jet event listener
     //------------------------
+    /**
+     * Sets the listener JetPlayer notifies when a JET event is generated by the rendering and
+     * playback engine.
+     * Notifications will be received in the same thread as the one in which the JetPlayer
+     * instance was created.
+     * @param listener
+     */
     public void setEventListener(OnJetEventListener listener) {
         setEventListener(listener, null);
     }
     
+    /**
+     * Sets the listener JetPlayer notifies when a JET event is generated by the rendering and
+     * playback engine.
+     * Use this method to receive JET events in the Handler associated with another
+     * thread than the one in which you created the JetPlayer instance.
+     * @param listener
+     * @param handler the Handler that will receive the event notification messages.
+     */
     public void setEventListener(OnJetEventListener listener, Handler handler) {
         synchronized(mEventListenerLock) {
             
@@ -343,7 +500,7 @@ public class JetPlayer
         void onJetEvent(JetPlayer player,
                 short segment, byte track, byte channel, byte controller, byte value);
         /**
-         * Callback for when JET's currently playing segment userID is updated.
+         * Callback for when JET's currently playing segment's userID is updated.
          * 
          * @param player the JET player the status update is coming from
          * @param userId the ID of the currently playing segment
@@ -363,7 +520,7 @@ public class JetPlayer
          * Callback for when JET pause state is updated.
          * 
          * @param player the JET player the status update is coming from
-         * @param paused indicates whether JET is paused or not
+         * @param paused indicates whether JET is paused (1) or not (0)
          */
         void onJetPauseUpdate(JetPlayer player, int paused);
     }
diff --git a/media/java/android/media/MediaRecorder.java b/media/java/android/media/MediaRecorder.java
index 676f24166dbc..5d90e6258207 100644
--- a/media/java/android/media/MediaRecorder.java
+++ b/media/java/android/media/MediaRecorder.java
@@ -219,6 +219,10 @@ public class MediaRecorder
      * Sets the format of the output file produced during recording. Call this
      * after setAudioSource()/setVideoSource() but before prepare().
      *
+     * <p>It is recommended to always use 3GP format when using the H.263
+     * video encoder and AMR audio encoder. Using an MPEG-4 container format
+     * may confuse some desktop players.</p>
+     *
      * @param output_format the output format to use. The output format
      * needs to be specified before setting recording-parameters or encoders.
      * @throws IllegalStateException if it is called after prepare() or before
diff --git a/media/java/android/media/MediaScanner.java b/media/java/android/media/MediaScanner.java
index cba6292175c4..c0cd5e3998ac 100644
--- a/media/java/android/media/MediaScanner.java
+++ b/media/java/android/media/MediaScanner.java
@@ -459,11 +459,12 @@ public class MediaScanner
                 FileCacheEntry entry = beginFile(path, mimeType, lastModified, fileSize);
                 // rescan for metadata if file was modified since last scan
                 if (entry != null && (entry.mLastModifiedChanged || scanAlways)) {
-                    boolean ringtones = (path.indexOf(RINGTONES_DIR) > 0);
-                    boolean notifications = (path.indexOf(NOTIFICATIONS_DIR) > 0);
-                    boolean alarms = (path.indexOf(ALARMS_DIR) > 0);
-                    boolean podcasts = (path.indexOf(PODCAST_DIR) > 0);
-                    boolean music = (path.indexOf(MUSIC_DIR) > 0) ||
+                    String lowpath = path.toLowerCase();
+                    boolean ringtones = (lowpath.indexOf(RINGTONES_DIR) > 0);
+                    boolean notifications = (lowpath.indexOf(NOTIFICATIONS_DIR) > 0);
+                    boolean alarms = (lowpath.indexOf(ALARMS_DIR) > 0);
+                    boolean podcasts = (lowpath.indexOf(PODCAST_DIR) > 0);
+                    boolean music = (lowpath.indexOf(MUSIC_DIR) > 0) ||
                         (!ringtones && !notifications && !alarms && !podcasts);
 
                     if (mFileType == MediaFile.FILE_TYPE_MP3 ||
diff --git a/media/java/android/media/SoundPool.java b/media/java/android/media/SoundPool.java
index 000430f96b63..b13c2e6ace1e 100644
--- a/media/java/android/media/SoundPool.java
+++ b/media/java/android/media/SoundPool.java
@@ -26,8 +26,77 @@ import android.content.Context;
 import android.content.res.AssetFileDescriptor;
 import java.io.IOException;
 
-/*
+/**
  * The SoundPool class manages and plays audio resources for applications.
+ *
+ * <p>A SoundPool is a collection of samples that can be loaded into memory
+ * from a resource inside the APK or from a file in the file system. The
+ * SoundPool library uses the MediaPlayer service to decode the audio
+ * into a raw 16-bit PCM mono or stereo stream. This allows applications
+ * to ship with compressed streams without having to suffer the CPU load
+ * and latency of decompressing during playback.</p>
+ *
+ * <p>In addition to low-latency playback, SoundPool can also manage the number
+ * of audio streams being rendered at once. When the SoundPool object is
+ * constructed, the maxStreams parameter sets the maximum number of streams
+ * that can be played at a time from this single SoundPool. SoundPool tracks
+ * the number of active streams. If the maximum number of streams is exceeded,
+ * SoundPool will automatically stop a previously playing stream based first
+ * on priority and then by age within that priority. Limiting the maximum
+ * number of streams helps to cap CPU loading and reducing the likelihood that
+ * audio mixing will impact visuals or UI performance.</p> 
+ *
+ * <p>Sounds can be looped by setting a non-zero loop value. A value of -1
+ * causes the sound to loop forever. In this case, the application must 
+ * explicitly call the stop() function to stop the sound. Any other non-zero
+ * value will cause the sound to repeat the specified number of times, e.g.
+ * a value of 3 causes the sound to play a total of 4 times.</p>
+ *
+ * <p>The playback rate can also be changed. A playback rate of 1.0 causes
+ * the sound to play at its original frequency (resampled, if necessary,
+ * to the hardware output frequency). A playback rate of 2.0 causes the
+ * sound to play at twice its original frequency, and a playback rate of
+ * 0.5 causes it to play at half its original frequency. The playback
+ * rate range is 0.5 to 2.0.</p>
+ *
+ * <p>Priority runs low to high, i.e. higher numbers are higher priority.
+ * Priority is used when a call to play() would cause the number of active
+ * streams to exceed the value established by the maxStreams parameter when
+ * the SoundPool was created. In this case, the stream allocator will stop
+ * the lowest priority stream. If there are multiple streams with the same
+ * low priority, it will choose the oldest stream to stop. In the case
+ * where the priority of the new stream is lower than all the active
+ * streams, the new sound will not play and the play() function will return
+ * a streamID of zero.</p>
+ *
+ * <p>Let's examine a typical use case: A game consists of several levels of
+ * play. For each level, there is a set of unique sounds that are used only
+ * by that level. In this case, the game logic should create a new SoundPool
+ * object when the first level is loaded. The level data itself might contain
+ * the list of sounds to be used by this level. The loading logic iterates
+ * through the list of sounds calling the appropriate SoundPool.load()
+ * function. This should typically be done early in the process to allow time
+ * for decompressing the audio to raw PCM format before they are needed for
+ * playback.</p>
+ *
+ * <p>Once the sounds are loaded and play has started, the application can
+ * trigger sounds by calling SoundPool.play(). Playing streams can be
+ * paused or resumed, and the application can also alter the pitch by
+ * adjusting the playback rate in real-time for doppler or synthesis
+ * effects.</p>
+ *
+ * <p>Note that since streams can be stopped due to resource constraints, the
+ * streamID is a reference to a particular instance of a stream. If the stream
+ * is stopped to allow a higher priority stream to play, the stream is no
+ * longer be valid. However, the application is allowed to call methods on
+ * the streamID without error. This may help simplify program logic since
+ * the application need not concern itself with the stream lifecycle.</p>
+ *
+ * <p>In our example, when the player has completed the level, the game
+ * logic should call SoundPool.release() to release all the native resources
+ * in use and then set the SoundPool reference to null. If the player starts
+ * another level, a new SoundPool is created, sounds are loaded, and play
+ * resumes.</p>
  */
 public class SoundPool
 {
@@ -37,10 +106,31 @@ public class SoundPool
 
     private int mNativeContext; // accessed by native methods
 
+    /**
+     * Constructor. Constructs a SoundPool object with the following
+     * characteristics:
+     *
+     * @param maxStreams the maximum number of simultaneous streams for this
+     *                   SoundPool object
+     * @param streamType the audio stream type as described in AudioManager 
+     *                   For example, game applications will normally use
+     *                   {@link AudioManager#STREAM_MUSIC}.
+     * @param srcQuality the sample-rate converter quality. Currently has no
+     *                   effect. Use 0 for the default.
+     * @return a SoundPool object, or null if creation failed
+     */
     public SoundPool(int maxStreams, int streamType, int srcQuality) {
         native_setup(new WeakReference<SoundPool>(this), maxStreams, streamType, srcQuality);
     }
 
+    /**
+     * Load the sound from the specified path.
+     *
+     * @param path the path to the audio file
+     * @param priority the priority of the sound. Currently has no effect. Use
+     *                 a value of 1 for future compatibility.
+     * @return a sound ID. This value can be used to play or unload the sound.
+     */
     public int load(String path, int priority)
     {
         // pass network streams to player
@@ -63,6 +153,21 @@ public class SoundPool
         return id;
     }
 
+    /**
+     * Load the sound from the specified APK resource.
+     *
+     * Note that the extension is dropped. For example, if you want to load
+     * a sound from the raw resource file "explosion.mp3", you would specify
+     * "R.raw.explosion" as the resource ID. Note that this means you cannot
+     * have both an "explosion.wav" and an "explosion.mp3" in the res/raw
+     * directory.
+     * 
+     * @param context the application context
+     * @param resId the resource ID
+     * @param priority the priority of the sound. Currently has no effect. Use
+     *                 a value of 1 for future compatibility.
+     * @return a sound ID. This value can be used to play or unload the sound.
+     */
     public int load(Context context, int resId, int priority) {
         AssetFileDescriptor afd = context.getResources().openRawResourceFd(resId);
         int id = 0;
@@ -78,6 +183,14 @@ public class SoundPool
         return id;
     }
 
+    /**
+     * Load the sound from an asset file descriptor.
+     *
+     * @param afd an asset file descriptor
+     * @param priority the priority of the sound. Currently has no effect. Use
+     *                 a value of 1 for future compatibility.
+     * @return a sound ID. This value can be used to play or unload the sound.
+     */
     public int load(AssetFileDescriptor afd, int priority) {
         if (afd != null) {
             long len = afd.getLength();
@@ -90,6 +203,20 @@ public class SoundPool
         }
     }
 
+    /**
+     * Load the sound from a FileDescriptor.
+     *
+     * This version is useful if you store multiple sounds in a single
+     * binary. The offset specifies the offset from the start of the file
+     * and the length specifies the length of the sound within the file.
+     *
+     * @param fd a FileDescriptor object
+     * @param offset offset to the start of the sound
+     * @param length length of the sound
+     * @param priority the priority of the sound. Currently has no effect. Use
+     *                 a value of 1 for future compatibility.
+     * @return a sound ID. This value can be used to play or unload the sound.
+     */
     public int load(FileDescriptor fd, long offset, long length, int priority) {
         return _load(fd, offset, length, priority);
     }
@@ -98,26 +225,144 @@ public class SoundPool
 
     private native final int _load(FileDescriptor fd, long offset, long length, int priority);
 
+    /**
+     * Unload a sound from a sound ID.
+     *
+     * Unloads the sound specified by the soundID. This is the value
+     * returned by the load() function. Returns true if the sound is
+     * successfully unloaded, false if the sound was already unloaded.
+     *
+     * @param soundID a soundID returned by the load() function
+     * @return true if just unloaded, false if previously unloaded
+     */
     public native final boolean unload(int soundID);
 
+    /**
+     * Play a sound from a sound ID.
+     *
+     * Play the sound specified by the soundID. This is the value 
+     * returned by the load() function. Returns a non-zero streamID
+     * if successful, zero if it fails. The streamID can be used to
+     * further control playback. Note that calling play() may cause
+     * another sound to stop playing if the maximum number of active
+     * streams is exceeded. A loop value of -1 means loop forever,
+     * a value of 0 means don't loop, other values indicate the
+     * number of repeats, e.g. a value of 1 plays the audio twice.
+     * The playback rate allows the application to vary the playback
+     * rate (pitch) of the sound. A value of 1.0 means play back at
+     * the original frequency. A value of 2.0 means play back twice
+     * as fast, and a value of 0.5 means playback at half speed.
+     *
+     * @param soundID a soundID returned by the load() function
+     * @param leftVolume left volume value (range = 0.0 to 1.0)
+     * @param rightVolume right volume value (range = 0.0 to 1.0)
+     * @param priority stream priority (0 = lowest priority)
+     * @param loop loop mode (0 = no loop, -1 = loop forever)
+     * @param rate playback rate (1.0 = normal playback, range 0.5 to 2.0)
+     * @return non-zero streamID if successful, zero if failed
+     */
     public native final int play(int soundID, float leftVolume, float rightVolume,
             int priority, int loop, float rate);
 
+    /**
+     * Pause a playback stream.
+     *
+     * Pause the stream specified by the streamID. This is the
+     * value returned by the play() function. If the stream is
+     * playing, it will be paused. If the stream is not playing
+     * (e.g. is stopped or was previously paused), calling this
+     * function will have no effect.
+     *
+     * @param streamID a streamID returned by the play() function
+     */
     public native final void pause(int streamID);
 
+    /**
+     * Resume a playback stream.
+     *
+     * Resume the stream specified by the streamID. This
+     * is the value returned by the play() function. If the stream
+     * is paused, this will resume playback. If the stream was not
+     * previously paused, calling this function will have no effect.
+     *
+     * @param streamID a streamID returned by the play() function
+     */
     public native final void resume(int streamID);
 
+    /**
+     * Stop a playback stream.
+     *
+     * Stop the stream specified by the streamID. This
+     * is the value returned by the play() function. If the stream
+     * is playing, it will be stopped. It also releases any native
+     * resources associated with this stream. If the stream is not
+     * playing, it will have no effect.
+     *
+     * @param streamID a streamID returned by the play() function
+     */
     public native final void stop(int streamID);
 
+    /**
+     * Set stream volume.
+     *
+     * Sets the volume on the stream specified by the streamID.
+     * This is the value returned by the play() function. The
+     * value must be in the range of 0.0 to 1.0. If the stream does
+     * not exist, it will have no effect.
+     *
+     * @param streamID a streamID returned by the play() function
+     * @param leftVolume left volume value (range = 0.0 to 1.0)
+     * @param rightVolume right volume value (range = 0.0 to 1.0)
+     */
     public native final void setVolume(int streamID,
             float leftVolume, float rightVolume);
 
+    /**
+     * Change stream priority.
+     *
+     * Change the priority of the stream specified by the streamID.
+     * This is the value returned by the play() function. Affects the
+     * order in which streams are re-used to play new sounds. If the
+     * stream does not exist, it will have no effect.
+     *
+     * @param streamID a streamID returned by the play() function
+     */
     public native final void setPriority(int streamID, int priority);
 
+    /**
+     * Set loop mode.
+     *
+     * Change the loop mode. A loop value of -1 means loop forever,
+     * a value of 0 means don't loop, other values indicate the
+     * number of repeats, e.g. a value of 1 plays the audio twice.
+     * If the stream does not exist, it will have no effect.
+     *
+     * @param streamID a streamID returned by the play() function
+     * @param loop loop mode (0 = no loop, -1 = loop forever)
+     */
     public native final void setLoop(int streamID, int loop);
 
+    /**
+     * Change playback rate.
+     *
+     * The playback rate allows the application to vary the playback
+     * rate (pitch) of the sound. A value of 1.0 means playback at
+     * the original frequency. A value of 2.0 means playback twice
+     * as fast, and a value of 0.5 means playback at half speed.
+     * If the stream does not exist, it will have no effect.
+     *
+     * @param streamID a streamID returned by the play() function
+     * @param rate playback rate (1.0 = normal playback, range 0.5 to 2.0)
+     */
     public native final void setRate(int streamID, float rate);
 
+    /**
+     * Release the SoundPool resources.
+     *
+     * Release all memory and native resources used by the SoundPool
+     * object. The SoundPool can no longer be used and the reference
+     * should be set to null.
+     */
     public native final void release();
 
     private native final void native_setup(Object mediaplayer_this,
diff --git a/media/libmedia/AudioRecord.cpp b/media/libmedia/AudioRecord.cpp
index 986f88ee100c..1720af0a9879 100644
--- a/media/libmedia/AudioRecord.cpp
+++ b/media/libmedia/AudioRecord.cpp
@@ -73,7 +73,6 @@ AudioRecord::~AudioRecord()
         // Otherwise the callback thread will never exit.
         stop();
         if (mClientRecordThread != 0) {
-            mCblk->cv.signal();
             mClientRecordThread->requestExitAndWait();
             mClientRecordThread.clear();
         }
@@ -96,7 +95,7 @@ status_t AudioRecord::set(
 {
 
     LOGV("set(): sampleRate %d, channelCount %d, frameCount %d",sampleRate, channelCount, frameCount);
-    if (mAudioFlinger != 0) {
+    if (mAudioRecord != 0) {
         return INVALID_OPERATION;
     }
 
@@ -181,7 +180,6 @@ status_t AudioRecord::set(
 
     mStatus = NO_ERROR;
 
-    mAudioFlinger = audioFlinger;
     mAudioRecord = record;
     mCblkMemory = cblk;
     mCblk = static_cast<audio_track_cblk_t*>(cblk->pointer());
@@ -293,6 +291,7 @@ status_t AudioRecord::stop()
      }
 
     if (android_atomic_and(~1, &mActive) == 1) {
+        mCblk->cv.signal();
         mAudioRecord->stop();
         // the record head position will reset to 0, so if a marker is set, we need
         // to activate it again
@@ -375,6 +374,7 @@ status_t AudioRecord::obtainBuffer(Buffer* audioBuffer, int32_t waitCount)
     status_t result;
     audio_track_cblk_t* cblk = mCblk;
     uint32_t framesReq = audioBuffer->frameCount;
+    uint32_t waitTimeMs = (waitCount < 0) ? cblk->bufferTimeoutMs : WAIT_PERIOD_MS;
 
     audioBuffer->frameCount  = 0;
     audioBuffer->size        = 0;
@@ -391,9 +391,9 @@ status_t AudioRecord::obtainBuffer(Buffer* audioBuffer, int32_t waitCount)
             if (UNLIKELY(!waitCount))
                 return WOULD_BLOCK;
             timeout = 0;
-            result = cblk->cv.waitRelative(cblk->lock, milliseconds(WAIT_PERIOD_MS));
+            result = cblk->cv.waitRelative(cblk->lock, milliseconds(waitTimeMs));
             if (__builtin_expect(result!=NO_ERROR, false)) {
-                cblk->waitTimeMs += WAIT_PERIOD_MS;
+                cblk->waitTimeMs += waitTimeMs;
                 if (cblk->waitTimeMs >= cblk->bufferTimeoutMs) {
                     LOGW(   "obtainBuffer timed out (is the CPU pegged?) "
                             "user=%08x, server=%08x", cblk->user, cblk->server);
@@ -520,7 +520,7 @@ bool AudioRecord::processAudioBuffer(const sp<ClientRecordThread>& thread)
         status_t err = obtainBuffer(&audioBuffer, 1);
         if (err < NO_ERROR) {
             if (err != TIMED_OUT) {
-                LOGE("Error obtaining an audio buffer, giving up.");
+                LOGE_IF(err != status_t(NO_MORE_BUFFERS), "Error obtaining an audio buffer, giving up.");
                 return false;
             }
             break;
diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp
index 24f72816d5f3..289bd7552cbb 100644
--- a/media/libmedia/AudioTrack.cpp
+++ b/media/libmedia/AudioTrack.cpp
@@ -92,7 +92,6 @@ AudioTrack::~AudioTrack()
         // Otherwise the callback thread will never exit.
         stop();
         if (mAudioTrackThread != 0) {
-            mCblk->cv.signal();
             mAudioTrackThread->requestExitAndWait();
             mAudioTrackThread.clear();
         }
@@ -117,7 +116,7 @@ status_t AudioTrack::set(
 
     LOGV_IF(sharedBuffer != 0, "sharedBuffer: %p, size: %d", sharedBuffer->pointer(), sharedBuffer->size());
 
-    if (mAudioFlinger != 0) {
+    if (mAudioTrack != 0) {
         LOGE("Track already in use");
         return INVALID_OPERATION;
     }
@@ -228,7 +227,6 @@ status_t AudioTrack::set(
 
     mStatus = NO_ERROR;
 
-    mAudioFlinger = audioFlinger;
     mAudioTrack = track;
     mCblkMemory = cblk;
     mCblk = static_cast<audio_track_cblk_t*>(cblk->pointer());
@@ -357,6 +355,7 @@ void AudioTrack::stop()
     }
 
     if (android_atomic_and(~1, &mActive) == 1) {
+        mCblk->cv.signal();
         mAudioTrack->stop();
         // Cancel loops (If we are in the middle of a loop, playback
         // would not stop until loopCount reaches 0).
@@ -596,6 +595,7 @@ status_t AudioTrack::obtainBuffer(Buffer* audioBuffer, int32_t waitCount)
     status_t result;
     audio_track_cblk_t* cblk = mCblk;
     uint32_t framesReq = audioBuffer->frameCount;
+    uint32_t waitTimeMs = (waitCount < 0) ? cblk->bufferTimeoutMs : WAIT_PERIOD_MS;
 
     audioBuffer->frameCount  = 0;
     audioBuffer->size = 0;
@@ -614,9 +614,9 @@ status_t AudioTrack::obtainBuffer(Buffer* audioBuffer, int32_t waitCount)
             if (UNLIKELY(!waitCount))
                 return WOULD_BLOCK;
             timeout = 0;
-            result = cblk->cv.waitRelative(cblk->lock, milliseconds(WAIT_PERIOD_MS));
+            result = cblk->cv.waitRelative(cblk->lock, milliseconds(waitTimeMs));
             if (__builtin_expect(result!=NO_ERROR, false)) { 
-                cblk->waitTimeMs += WAIT_PERIOD_MS;
+                cblk->waitTimeMs += waitTimeMs;
                 if (cblk->waitTimeMs >= cblk->bufferTimeoutMs) {
                     // timing out when a loop has been set and we have already written upto loop end
                     // is a normal condition: no need to wake AudioFlinger up.
@@ -798,7 +798,7 @@ bool AudioTrack::processAudioBuffer(const sp<AudioTrackThread>& thread)
         status_t err = obtainBuffer(&audioBuffer, 1);
         if (err < NO_ERROR) {
             if (err != TIMED_OUT) {
-                LOGE("Error obtaining an audio buffer, giving up.");
+                LOGE_IF(err != status_t(NO_MORE_BUFFERS), "Error obtaining an audio buffer, giving up.");
                 return false;
             }
             break;
diff --git a/media/libmedia/IAudioFlinger.cpp b/media/libmedia/IAudioFlinger.cpp
index 5cbb25ca1fc9..52bd7d4ebb60 100644
--- a/media/libmedia/IAudioFlinger.cpp
+++ b/media/libmedia/IAudioFlinger.cpp
@@ -336,7 +336,7 @@ public:
     {
         Parcel data, reply;
         data.writeInterfaceToken(IAudioFlinger::getInterfaceDescriptor());
-        remote()->transact(WAKE_UP, data, &reply);
+        remote()->transact(WAKE_UP, data, &reply, IBinder::FLAG_ONEWAY);
         return;
     }
 
diff --git a/media/libmedia/IAudioFlingerClient.cpp b/media/libmedia/IAudioFlingerClient.cpp
index 5feb11fb10bb..9d00aefb4ef6 100644
--- a/media/libmedia/IAudioFlingerClient.cpp
+++ b/media/libmedia/IAudioFlingerClient.cpp
@@ -43,7 +43,7 @@ public:
         Parcel data, reply;
         data.writeInterfaceToken(IAudioFlingerClient::getInterfaceDescriptor());
         data.writeInt32((int)enabled);
-        remote()->transact(AUDIO_OUTPUT_CHANGED, data, &reply);
+        remote()->transact(AUDIO_OUTPUT_CHANGED, data, &reply, IBinder::FLAG_ONEWAY);
     }
 };
 
diff --git a/packages/SubscribedFeedsProvider/src/com/android/providers/subscribedfeeds/SubscribedFeedsIntentService.java b/packages/SubscribedFeedsProvider/src/com/android/providers/subscribedfeeds/SubscribedFeedsIntentService.java
index 8268fee0cb0f..de7b1d7b064b 100644
--- a/packages/SubscribedFeedsProvider/src/com/android/providers/subscribedfeeds/SubscribedFeedsIntentService.java
+++ b/packages/SubscribedFeedsProvider/src/com/android/providers/subscribedfeeds/SubscribedFeedsIntentService.java
@@ -17,13 +17,15 @@ import android.database.sqlite.SQLiteFullException;
 import android.app.AlarmManager;
 import android.app.PendingIntent;
 import android.os.Bundle;
-import android.os.Debug;
 import android.text.TextUtils;
 import android.net.Uri;
+import android.accounts.Account;
 
 import java.util.ArrayList;
 import java.util.Calendar;
 
+import com.google.android.collect.Lists;
+
 /**
  * A service to handle various intents asynchronously.
  */
@@ -31,7 +33,8 @@ public class SubscribedFeedsIntentService extends IntentService {
     private static final String TAG = "Sync";
 
     private static final String[] sAccountProjection =
-            new String[] {SubscribedFeeds.Accounts._SYNC_ACCOUNT};
+            new String[] {SubscribedFeeds.Accounts._SYNC_ACCOUNT,
+                    SubscribedFeeds.Accounts._SYNC_ACCOUNT_TYPE};
 
     /** How often to refresh the subscriptions, in milliseconds */
     private static final long SUBSCRIPTION_REFRESH_INTERVAL = 1000L * 60 * 60 * 24; // one day
@@ -56,10 +59,10 @@ public class SubscribedFeedsIntentService extends IntentService {
         if (GTALK_DATA_MESSAGE_RECEIVED.equals(intent.getAction())) {
             boolean fromTrustedServer = intent.getBooleanExtra("from_trusted_server", false);
             if (fromTrustedServer) {
-                String account = intent.getStringExtra("account");
+                String accountName = intent.getStringExtra("account");
                 String token = intent.getStringExtra("message_token");
 
-                if (TextUtils.isEmpty(account) || TextUtils.isEmpty(token)) {
+                if (TextUtils.isEmpty(accountName) || TextUtils.isEmpty(token)) {
                     if (Config.LOGD) {
                         Log.d(TAG, "Ignoring malformed tickle -- missing account or token.");
                     }
@@ -68,10 +71,10 @@ public class SubscribedFeedsIntentService extends IntentService {
 
                 if (Config.LOGD) {
                     Log.d(TAG, "Received network tickle for "
-                            + account + " - " + token);
+                            + accountName + " - " + token);
                 }
 
-                handleTickle(this, account, token);
+                handleTickle(this, accountName, token);
             } else {
                 if (Log.isLoggable(TAG, Log.VERBOSE)) {
                     Log.v(TAG, "Ignoring tickle -- not from trusted server.");
@@ -103,20 +106,22 @@ public class SubscribedFeedsIntentService extends IntentService {
         alarmManager.set(AlarmManager.RTC, when, pendingIntent);
     }
 
-    private void handleTickle(Context context, String account, String feed) {
+    private void handleTickle(Context context, String accountName, String feed) {
         Cursor c = null;
         Sync.Settings.QueryMap syncSettings =
                 new Sync.Settings.QueryMap(context.getContentResolver(),
                         false /* don't keep updated */,
                         null /* not needed since keep updated is false */);
         final String where = SubscribedFeeds.Feeds._SYNC_ACCOUNT + "= ? "
+                + "and " + SubscribedFeeds.Feeds._SYNC_ACCOUNT_TYPE + "= ? "
                 + "and " + SubscribedFeeds.Feeds.FEED + "= ?";
         try {
+            // TODO(fredq) fix the hardcoded type
             c = context.getContentResolver().query(SubscribedFeeds.Feeds.CONTENT_URI,
-                    null, where, new String[]{account, feed}, null);
+                    null, where, new String[]{accountName, "com.google.GAIA", feed}, null);
             if (c.getCount() == 0) {
                 Log.w(TAG, "received tickle for non-existent feed: "
-                        + "account " + account + ", feed " + feed);
+                        + "account " + accountName + ", feed " + feed);
                 EventLog.writeEvent(LOG_TICKLE, "unknown");
             }
             while (c.moveToNext()) {
@@ -131,7 +136,8 @@ public class SubscribedFeedsIntentService extends IntentService {
                 }
                 Uri uri = Uri.parse("content://" + authority);
                 Bundle extras = new Bundle();
-                extras.putString(ContentResolver.SYNC_EXTRAS_ACCOUNT, account);
+                extras.putParcelable(ContentResolver.SYNC_EXTRAS_ACCOUNT,
+                        new Account(accountName, "com.google.GAIA"));
                 extras.putString("feed", feed);
                 context.getContentResolver().startSync(uri, extras);
             }
@@ -151,17 +157,15 @@ public class SubscribedFeedsIntentService extends IntentService {
      */
     private void handleRefreshAlarm(Context context) {
         // retrieve the list of accounts from the subscribed feeds
-        ArrayList<String> accounts = new ArrayList<String>();
+        ArrayList<Account> accounts = Lists.newArrayList();
         ContentResolver contentResolver = context.getContentResolver();
         Cursor c = contentResolver.query(SubscribedFeeds.Accounts.CONTENT_URI,
                 sAccountProjection, null, null, null);
         try {
             while (c.moveToNext()) {
-                String account = c.getString(0);
-                if (TextUtils.isEmpty(account)) {
-                    continue;
-                }
-                accounts.add(account);
+                String accountName = c.getString(0);
+                String accountType = c.getString(1);
+                accounts.add(new Account(accountName, accountType));
             }
         } finally {
             c.close();
@@ -169,16 +173,19 @@ public class SubscribedFeedsIntentService extends IntentService {
 
         // Clear the auth tokens for all these accounts so that we are sure
         // they will still be valid until the next time we refresh them.
-        // TODO: add this when the google login service is done
+        // TODO(fredq): add this when the google login service is done
 
         // mark the feeds dirty, by setting the accounts to the same value,
         //  which will trigger a sync.
         try {
             ContentValues values = new ContentValues();
-            for (String account : accounts) {
-                values.put(SyncConstValue._SYNC_ACCOUNT, account);
+            for (Account account : accounts) {
+                values.put(SyncConstValue._SYNC_ACCOUNT, account.mName);
+                values.put(SyncConstValue._SYNC_ACCOUNT_TYPE, account.mType);
                 contentResolver.update(SubscribedFeeds.Feeds.CONTENT_URI, values,
-                        SubscribedFeeds.Feeds._SYNC_ACCOUNT + "=?", new String[] {account});
+                        SubscribedFeeds.Feeds._SYNC_ACCOUNT + "=? AND "
+                                + SubscribedFeeds.Feeds._SYNC_ACCOUNT_TYPE + "=?",
+                        new String[] {account.mName, account.mType});
             }
         } catch (SQLiteFullException e) {
             Log.w(TAG, "disk full while trying to mark the feeds as dirty, skipping");
diff --git a/packages/SubscribedFeedsProvider/src/com/android/providers/subscribedfeeds/SubscribedFeedsProvider.java b/packages/SubscribedFeedsProvider/src/com/android/providers/subscribedfeeds/SubscribedFeedsProvider.java
index 9ecc3d61196b..d87f5e72ef14 100644
--- a/packages/SubscribedFeedsProvider/src/com/android/providers/subscribedfeeds/SubscribedFeedsProvider.java
+++ b/packages/SubscribedFeedsProvider/src/com/android/providers/subscribedfeeds/SubscribedFeedsProvider.java
@@ -39,7 +39,7 @@ import java.util.HashMap;
 public class SubscribedFeedsProvider extends AbstractSyncableContentProvider {
     private static final String TAG = "SubscribedFeedsProvider";
     private static final String DATABASE_NAME = "subscribedfeeds.db";
-    private static final int DATABASE_VERSION = 10;
+    private static final int DATABASE_VERSION = 11;
 
     private static final int FEEDS = 1;
     private static final int FEED_ID = 2;
@@ -88,6 +88,7 @@ public class SubscribedFeedsProvider extends AbstractSyncableContentProvider {
         db.execSQL("CREATE TABLE feeds (" +
                     "_id INTEGER PRIMARY KEY," +
                     "_sync_account TEXT," + // From the sync source
+                    "_sync_account_type TEXT," + // From the sync source
                     "_sync_id TEXT," + // From the sync source
                     "_sync_time TEXT," + // From the sync source
                     "_sync_version TEXT," + // From the sync source
@@ -106,8 +107,8 @@ public class SubscribedFeedsProvider extends AbstractSyncableContentProvider {
                     "WHEN old._sync_id is not null " +
                     "BEGIN " +
                         "INSERT INTO _deleted_feeds " +
-                            "(_sync_id, _sync_account, _sync_version) " +
-                            "VALUES (old._sync_id, old._sync_account, " +
+                            "(_sync_id, _sync_account, _sync_account_type, _sync_version) " +
+                            "VALUES (old._sync_id, old._sync_account, old._sync_account_type, " +
                             "old._sync_version);" +
                     "END");
 
@@ -116,6 +117,7 @@ public class SubscribedFeedsProvider extends AbstractSyncableContentProvider {
                     "_sync_id TEXT," +
                     (isTemporary() ? "_sync_local_id INTEGER," : "") + // Used while syncing,
                     "_sync_account TEXT," +
+                    "_sync_account_type TEXT," +
                     "_sync_mark INTEGER, " + // Used to filter out new rows
                     "UNIQUE(_sync_id))");
     }
@@ -170,7 +172,8 @@ public class SubscribedFeedsProvider extends AbstractSyncableContentProvider {
                 qb.setDistinct(true);
                 qb.setProjectionMap(ACCOUNTS_PROJECTION_MAP);
                 return qb.query(getDatabase(), projection, selection, selectionArgs,
-                        SubscribedFeeds.Feeds._SYNC_ACCOUNT, null, sortOrder);
+                        SubscribedFeeds.Feeds._SYNC_ACCOUNT_TYPE + ","
+                                + SubscribedFeeds.Feeds._SYNC_ACCOUNT, null, sortOrder);
             case FEED_ID:
                 qb.setTables(sFeedsTable);
                 qb.appendWhere(sFeedsTable + "._id=");
@@ -310,6 +313,8 @@ public class SubscribedFeedsProvider extends AbstractSyncableContentProvider {
             DatabaseUtils.cursorStringToContentValues(diffsCursor,
                     SubscribedFeeds.Feeds._SYNC_ACCOUNT, mValues);
             DatabaseUtils.cursorStringToContentValues(diffsCursor,
+                    SubscribedFeeds.Feeds._SYNC_ACCOUNT_TYPE, mValues);
+            DatabaseUtils.cursorStringToContentValues(diffsCursor,
                     SubscribedFeeds.Feeds._SYNC_VERSION, mValues);
             db.replace(mDeletedTable, SubscribedFeeds.Feeds._SYNC_ID, mValues);
         }
@@ -369,5 +374,7 @@ public class SubscribedFeedsProvider extends AbstractSyncableContentProvider {
         ACCOUNTS_PROJECTION_MAP = map;
         map.put(SubscribedFeeds.Accounts._COUNT, "COUNT(*) AS _count");
         map.put(SubscribedFeeds.Accounts._SYNC_ACCOUNT, SubscribedFeeds.Accounts._SYNC_ACCOUNT);
+        map.put(SubscribedFeeds.Accounts._SYNC_ACCOUNT_TYPE,
+                SubscribedFeeds.Accounts._SYNC_ACCOUNT_TYPE);
     }
 }
diff --git a/preloaded-classes b/preloaded-classes
index fc29906648cd..d1360eb87580 100644
--- a/preloaded-classes
+++ b/preloaded-classes
@@ -1,6 +1,5 @@
 # Classes which are preloaded by com.android.internal.os.ZygoteInit.
 android.R$styleable
-android.accounts.AccountMonitor
 android.app.Activity
 android.app.ActivityGroup
 android.app.ActivityManager$MemoryInfo$1
diff --git a/services/java/com/android/server/BatteryService.java b/services/java/com/android/server/BatteryService.java
index 609902464b56..90d8c9d4ca5d 100644
--- a/services/java/com/android/server/BatteryService.java
+++ b/services/java/com/android/server/BatteryService.java
@@ -84,7 +84,7 @@ class BatteryService extends Binder {
     private static final int CRITICAL_BATTERY_LEVEL = 4; 
 
     private static final int DUMP_MAX_LENGTH = 24 * 1024;
-    private static final String[] DUMPSYS_ARGS = new String[] { "-c", "-u" };
+    private static final String[] DUMPSYS_ARGS = new String[] { "--checkin", "-u" };
     private static final String BATTERY_STATS_SERVICE_NAME = "batteryinfo";
     
     private static final String DUMPSYS_DATA_PATH = "/data/system/";
@@ -251,10 +251,14 @@ class BatteryService extends Binder {
             // since the standard intent will not wake any applications and some
             // applications may want to have smart behavior based on this.
             if (mPlugType != 0 && mLastPlugType == 0) {
-                mContext.sendBroadcast(new Intent(Intent.ACTION_POWER_CONNECTED));
+                Intent intent = new Intent(Intent.ACTION_POWER_CONNECTED);
+                intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT);
+                mContext.sendBroadcast(intent);
             }
             else if (mPlugType == 0 && mLastPlugType != 0) {
-                mContext.sendBroadcast(new Intent(Intent.ACTION_POWER_DISCONNECTED));
+                Intent intent = new Intent(Intent.ACTION_POWER_DISCONNECTED);
+                intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT);
+                mContext.sendBroadcast(intent);
             }
             
             mLastBatteryStatus = mBatteryStatus;
diff --git a/services/java/com/android/server/LocationManagerService.java b/services/java/com/android/server/LocationManagerService.java
index 938a43d1f83a..5e079d46f7c6 100644
--- a/services/java/com/android/server/LocationManagerService.java
+++ b/services/java/com/android/server/LocationManagerService.java
@@ -44,6 +44,7 @@ import android.content.IntentFilter;
 import android.content.pm.PackageManager;
 import android.database.Cursor;
 import android.location.Address;
+import android.location.IGeocodeProvider;
 import android.location.IGpsStatusListener;
 import android.location.ILocationCollector;
 import android.location.ILocationListener;
@@ -55,7 +56,6 @@ import android.location.LocationProvider;
 import android.location.LocationProviderImpl;
 import android.net.ConnectivityManager;
 import android.net.Uri;
-import android.net.wifi.WifiManager;
 import android.os.Binder;
 import android.os.Bundle;
 import android.os.Handler;
@@ -66,13 +66,11 @@ import android.os.Process;
 import android.os.RemoteException;
 import android.os.SystemClock;
 import android.provider.Settings;
-import android.telephony.TelephonyManager;
 import android.util.Config;
 import android.util.Log;
 import android.util.PrintWriterPrinter;
 import android.util.SparseIntArray;
 
-import com.android.internal.app.IBatteryStats;
 import com.android.internal.location.GpsLocationProvider;
 import com.android.internal.location.LocationProviderProxy;
 import com.android.internal.location.MockProvider;
@@ -126,58 +124,33 @@ public class LocationManagerService extends ILocationManager.Stub {
 
     private final Context mContext;
     private GpsLocationProvider mGpsLocationProvider;
-    private boolean mGpsNavigating;
     private LocationProviderProxy mNetworkLocationProvider;
+    private IGeocodeProvider mGeocodeProvider;
     private LocationWorkerHandler mLocationHandler;
 
     // Handler messages
     private static final int MESSAGE_LOCATION_CHANGED = 1;
-    private static final int MESSAGE_ACQUIRE_WAKE_LOCK = 2;
-    private static final int MESSAGE_RELEASE_WAKE_LOCK = 3;
+    private static final int MESSAGE_RELEASE_WAKE_LOCK = 2;
 
     // Alarm manager and wakelock variables
     private final static String ALARM_INTENT = "com.android.location.ALARM_INTENT";
     private final static String WAKELOCK_KEY = "LocationManagerService";
-    private final static String WIFILOCK_KEY = "LocationManagerService";
     private AlarmManager mAlarmManager;
     private long mAlarmInterval = 0;
-    private boolean mScreenOn = true;
     private PowerManager.WakeLock mWakeLock = null;
-    private WifiManager.WifiLock mWifiLock = null;
     private long mWakeLockAcquireTime = 0;
     private boolean mWakeLockGpsReceived = true;
     private boolean mWakeLockNetworkReceived = true;
-    private boolean mWifiWakeLockAcquired = false;
-    private boolean mCellWakeLockAcquired = false;
-    
-    private final IBatteryStats mBatteryStats;
     
     /**
-     * Mapping from listener IBinder/PendingIntent to local Listener wrappers.
+     * List of all receivers.
      */
-    private final ArrayList<Receiver> mListeners = new ArrayList<Receiver>();
+    private final HashMap<Object, Receiver> mReceivers = new HashMap<Object, Receiver>();
 
     /**
-     * Used for reporting which UIDs are causing the GPS to run.
-     */
-    private final SparseIntArray mReportedGpsUids = new SparseIntArray();
-    private int mReportedGpsSeq = 0;
-    
-    /**
-     * Mapping from listener IBinder/PendingIntent to a map from provider name to UpdateRecord.
-     * This also serves as the lock for our state.
+     * Object used internally for synchronization
      */
-    private final HashMap<Receiver,HashMap<String,UpdateRecord>> mLocationListeners =
-        new HashMap<Receiver,HashMap<String,UpdateRecord>>();
-
-    /**
-     * Mapping from listener IBinder/PendingIntent to a map from provider name to last broadcast
-     * location.
-     */
-    private final HashMap<Receiver,HashMap<String,Location>> mLastFixBroadcast =
-        new HashMap<Receiver,HashMap<String,Location>>();
-    private final HashMap<Receiver,HashMap<String,Long>> mLastStatusBroadcast =
-        new HashMap<Receiver,HashMap<String,Long>>();
+    private final Object mLock = new Object();
 
     /**
      * Mapping from provider name to all its UpdateRecords
@@ -196,15 +169,9 @@ public class LocationManagerService extends ILocationManager.Stub {
     private HashMap<String,Location> mLastKnownLocation =
         new HashMap<String,Location>();
 
-    // Last known cell service state
-    private TelephonyManager mTelephonyManager;
-
     // Location collector
     private ILocationCollector mCollector;
 
-    // Wifi Manager
-    private WifiManager mWifiManager;
-
     private int mNetworkState = LocationProvider.TEMPORARILY_UNAVAILABLE;
 
     // for Settings change notification
@@ -217,20 +184,18 @@ public class LocationManagerService extends ILocationManager.Stub {
     private final class Receiver implements IBinder.DeathRecipient {
         final ILocationListener mListener;
         final PendingIntent mPendingIntent;
-        final int mUid;
         final Object mKey;
+        final HashMap<String,UpdateRecord> mUpdateRecords = new HashMap<String,UpdateRecord>();
 
-        Receiver(ILocationListener listener, int uid) {
+        Receiver(ILocationListener listener) {
             mListener = listener;
             mPendingIntent = null;
-            mUid = uid;
             mKey = listener.asBinder();
         }
 
-        Receiver(PendingIntent intent, int uid) {
+        Receiver(PendingIntent intent) {
             mPendingIntent = intent;
             mListener = null;
-            mUid = uid;
             mKey = intent;
         }
 
@@ -254,11 +219,11 @@ public class LocationManagerService extends ILocationManager.Stub {
             if (mListener != null) {
                 return "Receiver{"
                         + Integer.toHexString(System.identityHashCode(this))
-                        + " uid " + mUid + " Listener " + mKey + "}";
+                        + " Listener " + mKey + "}";
             } else {
                 return "Receiver{"
                         + Integer.toHexString(System.identityHashCode(this))
-                        + " uid " + mUid + " Intent " + mKey + "}";
+                        + " Intent " + mKey + "}";
             }
         }
 
@@ -327,7 +292,7 @@ public class LocationManagerService extends ILocationManager.Stub {
             if (LOCAL_LOGV) {
                 Log.v(TAG, "Location listener died");
             }
-            synchronized (mLocationListeners) {
+            synchronized (mLock) {
                 removeUpdatesLocked(this);
             }
         }
@@ -335,7 +300,7 @@ public class LocationManagerService extends ILocationManager.Stub {
 
     private final class SettingsObserver implements Observer {
         public void update(Observable o, Object arg) {
-            synchronized (mLocationListeners) {
+            synchronized (mLock) {
                 updateProvidersLocked();
             }
         }
@@ -442,7 +407,7 @@ public class LocationManagerService extends ILocationManager.Stub {
      *                                                          properties
      */
     private void loadProviders() {
-        synchronized (mLocationListeners) {
+        synchronized (mLock) {
             if (sProvidersLoaded) {
                 return;
             }
@@ -556,15 +521,9 @@ public class LocationManagerService extends ILocationManager.Stub {
         PowerManager powerManager = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
         mWakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, WAKELOCK_KEY);
         
-        // Battery statistics service to be notified when GPS turns on or off
-        mBatteryStats = BatteryStatsService.getService();
-
         // Load providers
         loadProviders();
 
-        // Listen for Radio changes
-        mTelephonyManager = (TelephonyManager)context.getSystemService(Context.TELEPHONY_SERVICE);
-
         // Register for Network (Wifi or Mobile) updates
         NetworkStateBroadcastReceiver networkReceiver = new NetworkStateBroadcastReceiver();
         IntentFilter networkIntentFilter = new IntentFilter();
@@ -576,8 +535,6 @@ public class LocationManagerService extends ILocationManager.Stub {
         PowerStateBroadcastReceiver powerStateReceiver = new PowerStateBroadcastReceiver();
         IntentFilter intentFilter = new IntentFilter();
         intentFilter.addAction(ALARM_INTENT);
-        intentFilter.addAction(Intent.ACTION_SCREEN_OFF);
-        intentFilter.addAction(Intent.ACTION_SCREEN_ON);
         intentFilter.addAction(Intent.ACTION_PACKAGE_REMOVED);
         intentFilter.addAction(Intent.ACTION_PACKAGE_RESTARTED);
         context.registerReceiver(powerStateReceiver, intentFilter);
@@ -591,12 +548,6 @@ public class LocationManagerService extends ILocationManager.Stub {
         mSettings = new ContentQueryMap(settingsCursor, Settings.System.NAME, true, mLocationHandler);
         SettingsObserver settingsObserver = new SettingsObserver();
         mSettings.addObserver(settingsObserver);
-
-        // Get the wifi manager
-        mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
-
-        // Create a wifi lock for future use
-        mWifiLock = getWifiWakelockLocked();
     }
 
     public void setNetworkLocationProvider(ILocationProvider provider) {
@@ -605,16 +556,14 @@ public class LocationManagerService extends ILocationManager.Stub {
                 "Installing location providers outside of the system is not supported");
         }
 
-        synchronized (mLocationListeners) {
+        synchronized (mLock) {
             mNetworkLocationProvider =
                     new LocationProviderProxy(LocationManager.NETWORK_PROVIDER, this, provider);
-            mNetworkLocationProvider.addListener(getPackageNames());
             LocationProviderImpl.addProvider(mNetworkLocationProvider);
             updateProvidersLocked();
             
             // notify NetworkLocationProvider of any events it might have missed
             mNetworkLocationProvider.updateNetworkState(mNetworkState);
-            mNetworkLocationProvider.updateCellLockStatus(mCellWakeLockAcquired);
         }
     }
 
@@ -624,20 +573,16 @@ public class LocationManagerService extends ILocationManager.Stub {
                 "Installing location collectors outside of the system is not supported");
         }
 
-        synchronized (mLocationListeners) {
-            mCollector = collector;
-            if (mGpsLocationProvider != null) {
-                mGpsLocationProvider.setLocationCollector(mCollector);
-            }
-        }
+        mCollector = collector;
     }
 
-    private WifiManager.WifiLock getWifiWakelockLocked() {
-        if (mWifiLock == null && mWifiManager != null) {
-            mWifiLock = mWifiManager.createWifiLock(WifiManager.WIFI_MODE_SCAN_ONLY, WIFILOCK_KEY);
-            mWifiLock.setReferenceCounted(false);
+    public void setGeocodeProvider(IGeocodeProvider provider) {
+        if (Binder.getCallingUid() != Process.SYSTEM_UID) {
+            throw new SecurityException(
+                "Installing location providers outside of the system is not supported");
         }
-        return mWifiLock;
+
+        mGeocodeProvider = provider;
     }
 
     private boolean isAllowedBySettingsLocked(String provider) {
@@ -688,15 +633,9 @@ public class LocationManagerService extends ILocationManager.Stub {
         return true;
     }
 
-    private String[] getPackageNames() {
-        // Since a single UID may correspond to multiple packages, this can only be used as an
-        // approximation for tracking
-        return mContext.getPackageManager().getPackagesForUid(Binder.getCallingUid());
-    }
-
     public List<String> getAllProviders() {
         try {
-            synchronized (mLocationListeners) {
+            synchronized (mLock) {
                 return _getAllProvidersLocked();
             }
         } catch (SecurityException se) {
@@ -722,7 +661,7 @@ public class LocationManagerService extends ILocationManager.Stub {
 
     public List<String> getProviders(boolean enabledOnly) {
         try {
-            synchronized (mLocationListeners) {
+            synchronized (mLock) {
                 return _getProvidersLocked(enabledOnly);
             }
         } catch (SecurityException se) {
@@ -822,16 +761,12 @@ public class LocationManagerService extends ILocationManager.Stub {
             if (listeners > 0) {
                 p.setMinTime(getMinTimeLocked(provider));
                 p.enableLocationTracking(true);
-                updateWakelockStatusLocked(mScreenOn);
+                updateWakelockStatusLocked();
             }
         } else {
             p.enableLocationTracking(false);
-            if (p == mGpsLocationProvider) {
-                mGpsNavigating = false;
-                reportStopGpsLocked();
-            }
             p.disable();
-            updateWakelockStatusLocked(mScreenOn);
+            updateWakelockStatusLocked();
         }
     }
 
@@ -852,19 +787,19 @@ public class LocationManagerService extends ILocationManager.Stub {
         final long mMinTime;
         final float mMinDistance;
         final int mUid;
-        final String[] mPackages;
+        Location mLastFixBroadcast;
+        long mLastStatusBroadcast;
 
         /**
          * Note: must be constructed with lock held.
          */
         UpdateRecord(String provider, long minTime, float minDistance,
-            Receiver receiver, int uid, String[] packages) {
+            Receiver receiver, int uid) {
             mProvider = provider;
             mReceiver = receiver;
             mMinTime = minTime;
             mMinDistance = minDistance;
             mUid = uid;
-            mPackages = packages;
 
             ArrayList<UpdateRecord> records = mRecordsByProvider.get(provider);
             if (records == null) {
@@ -896,33 +831,77 @@ public class LocationManagerService extends ILocationManager.Stub {
             pw.println(prefix + this);
             pw.println(prefix + "mProvider=" + mProvider + " mReceiver=" + mReceiver);
             pw.println(prefix + "mMinTime=" + mMinTime + " mMinDistance=" + mMinDistance);
-            StringBuilder sb = new StringBuilder();
-            if (mPackages != null) {
-                for (int i=0; i<mPackages.length; i++) {
-                    if (i > 0) sb.append(", ");
-                    sb.append(mPackages[i]);
-                }
-            }
-            pw.println(prefix + "mUid=" + mUid + " mPackages=" + sb);
+            pw.println(prefix + "mUid=" + mUid);
+            pw.println(prefix + "mLastFixBroadcast:");
+            mLastFixBroadcast.dump(new PrintWriterPrinter(pw), prefix + "  ");
+            pw.println(prefix + "mLastStatusBroadcast=" + mLastStatusBroadcast);
         }
         
         /**
          * Calls dispose().
          */
         @Override protected void finalize() {
-            synchronized (mLocationListeners) {
+            synchronized (mLock) {
                 disposeLocked();
             }
         }
     }
 
+    private Receiver getReceiver(ILocationListener listener) {
+        IBinder binder = listener.asBinder();
+        Receiver receiver = mReceivers.get(binder);
+        if (receiver == null) {
+            receiver = new Receiver(listener);
+            mReceivers.put(binder, receiver);
+
+            try {
+                if (receiver.isListener()) {
+                    receiver.getListener().asBinder().linkToDeath(receiver, 0);
+                }
+            } catch (RemoteException e) {
+                Log.e(TAG, "linkToDeath failed:", e);
+                return null;
+            }
+        }
+        return receiver;
+    }
+
+    private Receiver getReceiver(PendingIntent intent) {
+        Receiver receiver = mReceivers.get(intent);
+        if (receiver == null) {
+            receiver = new Receiver(intent);
+            mReceivers.put(intent, receiver);
+        }
+        return receiver;
+    }
+
+    private boolean providerHasListener(String provider, int uid, Receiver excludedReceiver) {
+        ArrayList<UpdateRecord> records = mRecordsByProvider.get(provider);
+        if (records != null) {
+            for (int i = records.size() - 1; i >= 0; i--) {
+                UpdateRecord record = records.get(i);
+                if (record.mUid == uid && record.mReceiver != excludedReceiver) {
+                    return true;
+                }
+           }
+        }
+        if (LocationManager.GPS_PROVIDER.equals(provider) ||
+                LocationManager.NETWORK_PROVIDER.equals(provider)) {
+            for (ProximityAlert alert : mProximityAlerts.values()) {
+                if (alert.mUid == uid) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
     public void requestLocationUpdates(String provider,
         long minTime, float minDistance, ILocationListener listener) {
 
         try {
-            synchronized (mLocationListeners) {
-                requestLocationUpdatesLocked(provider, minTime, minDistance,
-                    new Receiver(listener, Binder.getCallingUid()));
+            synchronized (mLock) {
+                requestLocationUpdatesLocked(provider, minTime, minDistance, getReceiver(listener));
             }
         } catch (SecurityException se) {
             throw se;
@@ -934,9 +913,8 @@ public class LocationManagerService extends ILocationManager.Stub {
     public void requestLocationUpdatesPI(String provider,
             long minTime, float minDistance, PendingIntent intent) {
         try {
-            synchronized (mLocationListeners) {
-                requestLocationUpdatesLocked(provider, minTime, minDistance,
-                        new Receiver(intent, Binder.getCallingUid()));
+            synchronized (mLock) {
+                requestLocationUpdatesLocked(provider, minTime, minDistance, getReceiver(intent));
             }
         } catch (SecurityException se) {
             throw se;
@@ -958,47 +936,27 @@ public class LocationManagerService extends ILocationManager.Stub {
 
         checkPermissionsSafe(provider);
 
-        String[] packages = getPackageNames();
-
         // so wakelock calls will succeed
         final int callingUid = Binder.getCallingUid();
+        boolean newUid = !providerHasListener(provider, callingUid, null);
         long identity = Binder.clearCallingIdentity();
         try {
-            UpdateRecord r = new UpdateRecord(provider, minTime, minDistance,
-                    receiver, callingUid, packages);
-            if (!mListeners.contains(receiver)) {
-                try {
-                    if (receiver.isListener()) {
-                        receiver.getListener().asBinder().linkToDeath(receiver, 0);
-                    }
-                    mListeners.add(receiver);
-                } catch (RemoteException e) {
-                    return;
-                }
-            }
-
-            HashMap<String,UpdateRecord> records = mLocationListeners.get(receiver);
-            if (records == null) {
-                records = new HashMap<String,UpdateRecord>();
-                mLocationListeners.put(receiver, records);
-            }
-            UpdateRecord oldRecord = records.put(provider, r);
+            UpdateRecord r = new UpdateRecord(provider, minTime, minDistance, receiver, callingUid);
+            UpdateRecord oldRecord = receiver.mUpdateRecords.put(provider, r);
             if (oldRecord != null) {
                 oldRecord.disposeLocked();
             }
 
+            if (newUid) {
+                impl.addListener(callingUid);
+            }
+
             boolean isProviderEnabled = isAllowedBySettingsLocked(provider);
             if (isProviderEnabled) {
                 long minTimeForProvider = getMinTimeLocked(provider);
                 impl.setMinTime(minTimeForProvider);
                 impl.enableLocationTracking(true);
-                updateWakelockStatusLocked(mScreenOn);
-
-                if (provider.equals(LocationManager.GPS_PROVIDER)) {
-                    if (mGpsNavigating) {
-                        updateReportedGpsLocked();
-                    }
-                }
+                updateWakelockStatusLocked();
             } else {
                 try {
                     // Notify the listener that updates are currently disabled
@@ -1017,8 +975,8 @@ public class LocationManagerService extends ILocationManager.Stub {
 
     public void removeUpdates(ILocationListener listener) {
         try {
-            synchronized (mLocationListeners) {
-                removeUpdatesLocked(new Receiver(listener, Binder.getCallingUid()));
+            synchronized (mLock) {
+                removeUpdatesLocked(getReceiver(listener));
             }
         } catch (SecurityException se) {
             throw se;
@@ -1029,8 +987,8 @@ public class LocationManagerService extends ILocationManager.Stub {
 
     public void removeUpdatesPI(PendingIntent intent) {
         try {
-            synchronized (mLocationListeners) {
-                removeUpdatesLocked(new Receiver(intent, Binder.getCallingUid()));
+            synchronized (mLock) {
+                removeUpdatesLocked(getReceiver(intent));
             }
         } catch (SecurityException se) {
             throw se;
@@ -1048,23 +1006,21 @@ public class LocationManagerService extends ILocationManager.Stub {
         final int callingUid = Binder.getCallingUid();
         long identity = Binder.clearCallingIdentity();
         try {
-            int idx = mListeners.indexOf(receiver);
-            if (idx >= 0) {
-                Receiver myReceiver = mListeners.remove(idx);
-                if (myReceiver.isListener()) {
-                    myReceiver.getListener().asBinder().unlinkToDeath(myReceiver, 0);
-                }
+            if (mReceivers.remove(receiver.mKey) != null && receiver.isListener()) {
+                receiver.getListener().asBinder().unlinkToDeath(receiver, 0);
             }
 
             // Record which providers were associated with this listener
             HashSet<String> providers = new HashSet<String>();
-            HashMap<String,UpdateRecord> oldRecords = mLocationListeners.get(receiver);
+            HashMap<String,UpdateRecord> oldRecords = receiver.mUpdateRecords;
             if (oldRecords != null) {
                 // Call dispose() on the obsolete update records.
                 for (UpdateRecord record : oldRecords.values()) {
-                    if (record.mProvider.equals(LocationManager.NETWORK_PROVIDER)) {
-                        if (mNetworkLocationProvider != null) {
-                            mNetworkLocationProvider.removeListener(record.mPackages);
+                    if (!providerHasListener(record.mProvider, callingUid, receiver)) {
+                        LocationProviderImpl impl =
+                                LocationProviderImpl.getProvider(record.mProvider);
+                        if (impl != null) {
+                            impl.removeListener(callingUid);
                         }
                     }
                     record.disposeLocked();
@@ -1072,10 +1028,6 @@ public class LocationManagerService extends ILocationManager.Stub {
                 // Accumulate providers
                 providers.addAll(oldRecords.keySet());
             }
-            
-            mLocationListeners.remove(receiver);
-            mLastFixBroadcast.remove(receiver);
-            mLastStatusBroadcast.remove(receiver);
 
             // See if the providers associated with this listener have any
             // other listeners; if one does, inform it of the new smallest minTime
@@ -1099,14 +1051,10 @@ public class LocationManagerService extends ILocationManager.Stub {
                     } else {
                         p.enableLocationTracking(false);
                     }
-                    
-                    if (p == mGpsLocationProvider && mGpsNavigating) {
-                        updateReportedGpsLocked();
-                    }
                 }
             }
 
-            updateWakelockStatusLocked(mScreenOn);
+            updateWakelockStatusLocked();
         } finally {
             Binder.restoreCallingIdentity(identity);
         }
@@ -1131,7 +1079,7 @@ public class LocationManagerService extends ILocationManager.Stub {
     }
 
     public void removeGpsStatusListener(IGpsStatusListener listener) {
-        synchronized (mLocationListeners) {
+        synchronized (mLock) {
             mGpsLocationProvider.removeGpsStatusListener(listener);
         }
     }
@@ -1145,7 +1093,7 @@ public class LocationManagerService extends ILocationManager.Stub {
             throw new SecurityException("Requires ACCESS_LOCATION_EXTRA_COMMANDS permission");
         }
 
-        synchronized (mLocationListeners) {
+        synchronized (mLock) {
             LocationProviderImpl impl = LocationProviderImpl.getProvider(provider);
             if (provider == null) {
                 return false;
@@ -1326,7 +1274,7 @@ public class LocationManagerService extends ILocationManager.Stub {
     public void addProximityAlert(double latitude, double longitude,
         float radius, long expiration, PendingIntent intent) {
         try {
-            synchronized (mLocationListeners) {
+            synchronized (mLock) {
                 addProximityAlertLocked(latitude, longitude, radius, expiration, intent);
             }
         } catch (SecurityException se) {
@@ -1359,7 +1307,7 @@ public class LocationManagerService extends ILocationManager.Stub {
         mProximityAlerts.put(intent, alert);
 
         if (mProximityListener == null) {
-            mProximityListener = new Receiver(new ProximityListener(), -1);
+            mProximityListener = new Receiver(new ProximityListener());
 
             LocationProvider provider = LocationProviderImpl.getProvider(
                 LocationManager.GPS_PROVIDER);
@@ -1372,14 +1320,12 @@ public class LocationManagerService extends ILocationManager.Stub {
             if (provider != null) {
                 requestLocationUpdatesLocked(provider.getName(), 1000L, 1.0f, mProximityListener);
             }
-        } else if (mGpsNavigating) {
-            updateReportedGpsLocked();
         }
     }
 
     public void removeProximityAlert(PendingIntent intent) {
         try {
-            synchronized (mLocationListeners) {
+            synchronized (mLock) {
                removeProximityAlertLocked(intent);
             }
         } catch (SecurityException se) {
@@ -1398,8 +1344,6 @@ public class LocationManagerService extends ILocationManager.Stub {
         if (mProximityAlerts.size() == 0) {
             removeUpdatesLocked(mProximityListener);
             mProximityListener = null;
-        } else if (mGpsNavigating) {
-            updateReportedGpsLocked();
         }
      }
 
@@ -1410,7 +1354,7 @@ public class LocationManagerService extends ILocationManager.Stub {
      */
     public Bundle getProviderInfo(String provider) {
         try {
-            synchronized (mLocationListeners) {
+            synchronized (mLock) {
                 return _getProviderInfoLocked(provider);
             }
         } catch (SecurityException se) {
@@ -1445,7 +1389,7 @@ public class LocationManagerService extends ILocationManager.Stub {
 
     public boolean isProviderEnabled(String provider) {
         try {
-            synchronized (mLocationListeners) {
+            synchronized (mLock) {
                 return _isProviderEnabledLocked(provider);
             }
         } catch (SecurityException se) {
@@ -1474,7 +1418,7 @@ public class LocationManagerService extends ILocationManager.Stub {
 
     public Location getLastKnownLocation(String provider) {
         try {
-            synchronized (mLocationListeners) {
+            synchronized (mLock) {
                 return _getLastKnownLocationLocked(provider);
             }
         } catch (SecurityException se) {
@@ -1574,16 +1518,11 @@ public class LocationManagerService extends ILocationManager.Stub {
             UpdateRecord r = records.get(i);
             Receiver receiver = r.mReceiver;
 
-            HashMap<String,Location> map = mLastFixBroadcast.get(receiver);
-            if (map == null) {
-                map = new HashMap<String,Location>();
-                mLastFixBroadcast.put(receiver, map);
-            }
-            Location lastLoc = map.get(provider);
+            Location lastLoc = r.mLastFixBroadcast;
             if ((lastLoc == null) || shouldBroadcastSafe(location, lastLoc, r)) {
                 if (lastLoc == null) {
                     lastLoc = new Location(location);
-                    map.put(provider, lastLoc);
+                    r.mLastFixBroadcast = lastLoc;
                 } else {
                     lastLoc.set(location);
                 }
@@ -1596,19 +1535,11 @@ public class LocationManagerService extends ILocationManager.Stub {
                 }
             }
 
-            // Broadcast status message
-            HashMap<String,Long> statusMap = mLastStatusBroadcast.get(receiver);
-            if (statusMap == null) {
-                statusMap = new HashMap<String,Long>();
-                mLastStatusBroadcast.put(receiver, statusMap);
-            }
-            long prevStatusUpdateTime =
-                (statusMap.get(provider) != null) ? statusMap.get(provider) : 0;
-
+            long prevStatusUpdateTime = r.mLastStatusBroadcast;
             if ((newStatusUpdateTime > prevStatusUpdateTime) &&
                 (prevStatusUpdateTime != 0 || status != LocationProvider.AVAILABLE)) {
 
-                statusMap.put(provider, newStatusUpdateTime);
+                r.mLastStatusBroadcast = newStatusUpdateTime;
                 if (!receiver.callStatusChangedLocked(provider, status, extras)) {
                     Log.w(TAG, "RemoteException calling onStatusChanged on " + receiver);
                     if (deadReceivers == null) {
@@ -1636,23 +1567,29 @@ public class LocationManagerService extends ILocationManager.Stub {
                 if (msg.what == MESSAGE_LOCATION_CHANGED) {
                     // log("LocationWorkerHandler: MESSAGE_LOCATION_CHANGED!");
 
-                    synchronized (mLocationListeners) {
+                    synchronized (mLock) {
                         Location location = (Location) msg.obj;
+
+                        if (mCollector != null && 
+                                LocationManager.GPS_PROVIDER.equals(location.getProvider())) {
+                            try {
+                                mCollector.updateLocation(location);
+                            } catch (RemoteException e) {
+                                Log.w(TAG, "mCollector.updateLocation failed");
+                            }
+                        }
+
                         String provider = location.getProvider();
                         if (!isAllowedBySettingsLocked(provider)) {
                             return;
                         }
 
-                        // Process the location fix if the screen is on or we're holding a wakelock
-                        if (mScreenOn || (mWakeLockAcquireTime != 0)) {
-                            handleLocationChangedLocked(location);
-                        }
+                        handleLocationChangedLocked(location);
 
                         if ((mWakeLockAcquireTime != 0) &&
                             (SystemClock.elapsedRealtime() - mWakeLockAcquireTime
                                 > MAX_TIME_FOR_WAKE_LOCK)) {
     
-                            removeMessages(MESSAGE_ACQUIRE_WAKE_LOCK);
                             removeMessages(MESSAGE_RELEASE_WAKE_LOCK);
     
                             log("LocationWorkerHandler: Exceeded max time for wake lock");
@@ -1662,7 +1599,6 @@ public class LocationManagerService extends ILocationManager.Stub {
                         } else if (mWakeLockAcquireTime != 0 &&
                             mWakeLockGpsReceived && mWakeLockNetworkReceived) {
     
-                            removeMessages(MESSAGE_ACQUIRE_WAKE_LOCK);
                             removeMessages(MESSAGE_RELEASE_WAKE_LOCK);
     
                             log("LocationWorkerHandler: Locations received.");
@@ -1671,18 +1607,12 @@ public class LocationManagerService extends ILocationManager.Stub {
                             sendMessageDelayed(m, TIME_AFTER_WAKE_LOCK);
                         }
                     }
-
-                } else if (msg.what == MESSAGE_ACQUIRE_WAKE_LOCK) {
-                    log("LocationWorkerHandler: Acquire");
-                    synchronized (mLocationListeners) {
-                        acquireWakeLockLocked();
-                    }
                 } else if (msg.what == MESSAGE_RELEASE_WAKE_LOCK) {
                     log("LocationWorkerHandler: Release");
 
                     // Update wakelock status so the next alarm is set before releasing wakelock
-                    synchronized (mLocationListeners) {
-                        updateWakelockStatusLocked(mScreenOn);
+                    synchronized (mLock) {
+                        updateWakelockStatusLocked();
                         releaseWakeLockLocked();
                     }
                 }
@@ -1698,30 +1628,17 @@ public class LocationManagerService extends ILocationManager.Stub {
             String action = intent.getAction();
 
             if (action.equals(ALARM_INTENT)) {
-                synchronized (mLocationListeners) {
+                synchronized (mLock) {
                     log("PowerStateBroadcastReceiver: Alarm received");
-                    mLocationHandler.removeMessages(MESSAGE_ACQUIRE_WAKE_LOCK);
                     // Have to do this immediately, rather than posting a
                     // message, so we execute our code while the system
                     // is holding a wake lock until the alarm broadcast
                     // is finished.
                     acquireWakeLockLocked();
                 }
-
-            } else if (action.equals(Intent.ACTION_SCREEN_OFF)) {
-                log("PowerStateBroadcastReceiver: Screen off");
-                synchronized (mLocationListeners) {
-                    updateWakelockStatusLocked(false);
-                }
-
-            } else if (action.equals(Intent.ACTION_SCREEN_ON)) {
-                log("PowerStateBroadcastReceiver: Screen on");
-                synchronized (mLocationListeners) {
-                    updateWakelockStatusLocked(true);
-                }
             } else if (action.equals(Intent.ACTION_PACKAGE_REMOVED)
                     || action.equals(Intent.ACTION_PACKAGE_RESTARTED)) {
-                synchronized (mLocationListeners) {
+                synchronized (mLock) {
                     int uid = intent.getIntExtra(Intent.EXTRA_UID, -1);
                     if (uid >= 0) {
                         ArrayList<Receiver> removedRecs = null;
@@ -1779,7 +1696,7 @@ public class LocationManagerService extends ILocationManager.Stub {
                 }
 
                 // Notify location providers of current network state
-                synchronized (mLocationListeners) {
+                synchronized (mLock) {
                     List<LocationProviderImpl> providers = LocationProviderImpl.getProviders();
                     for (LocationProviderImpl provider : providers) {
                         if (provider.requiresNetwork()) {
@@ -1792,13 +1709,8 @@ public class LocationManagerService extends ILocationManager.Stub {
                 final boolean enabled = intent.getBooleanExtra(GpsLocationProvider.EXTRA_ENABLED,
                     false);
 
-                synchronized (mLocationListeners) {
-                    if (enabled) {
-                        updateReportedGpsLocked();
-                        mGpsNavigating = true;
-                    } else {
-                        reportStopGpsLocked();
-                        mGpsNavigating = false;
+                synchronized (mLock) {
+                    if (!enabled) {
                         // When GPS is disabled, we are OK to release wake-lock
                         mWakeLockGpsReceived = true;
                     }
@@ -1810,8 +1722,8 @@ public class LocationManagerService extends ILocationManager.Stub {
 
     // Wake locks
 
-    private void updateWakelockStatusLocked(boolean screenOn) {
-        log("updateWakelockStatus(): " + screenOn);
+    private void updateWakelockStatusLocked() {
+        log("updateWakelockStatus()");
 
         long callerId = Binder.clearCallingIdentity();
         
@@ -1826,16 +1738,8 @@ public class LocationManagerService extends ILocationManager.Stub {
         if (mGpsLocationProvider != null && mGpsLocationProvider.isLocationTracking()) {
             needsLock = true;
             minTime = Math.min(mGpsLocationProvider.getMinTime(), minTime);
-            if (screenOn) {
-                startGpsLocked();
-            } else if (mScreenOn && !screenOn) {
-                // We just turned the screen off so stop navigating
-                stopGpsLocked();
-            }
         }
 
-        mScreenOn = screenOn;
-
         PendingIntent sender =
             PendingIntent.getBroadcast(mContext, 0, new Intent(ALARM_INTENT), 0);
 
@@ -1843,7 +1747,7 @@ public class LocationManagerService extends ILocationManager.Stub {
         log("Cancelling existing alarm");
         mAlarmManager.cancel(sender);
 
-        if (needsLock && !mScreenOn) {
+        if (needsLock) {
             long now = SystemClock.elapsedRealtime();
             mAlarmManager.set(
                 AlarmManager.ELAPSED_REALTIME_WAKEUP, now + minTime, sender);
@@ -1854,7 +1758,6 @@ public class LocationManagerService extends ILocationManager.Stub {
             mAlarmInterval = -1;
 
             // Clear out existing wakelocks
-            mLocationHandler.removeMessages(MESSAGE_ACQUIRE_WAKE_LOCK);
             mLocationHandler.removeMessages(MESSAGE_RELEASE_WAKE_LOCK);
             releaseWakeLockLocked();
         }
@@ -1897,131 +1800,11 @@ public class LocationManagerService extends ILocationManager.Stub {
         mWakeLockAcquireTime = SystemClock.elapsedRealtime();
         log("Acquired wakelock");
 
-        // Start the gps provider
-        startGpsLocked();
-
-        // Acquire cell lock
-        if (mCellWakeLockAcquired) {
-            // Lock is already acquired
-        } else if (!mWakeLockNetworkReceived) {
-            mTelephonyManager.enableLocationUpdates();
-            mCellWakeLockAcquired = true;
-        } else {
-            mCellWakeLockAcquired = false;
-        }
-
-        // Notify NetworkLocationProvider
         if (mNetworkLocationProvider != null) {
-            mNetworkLocationProvider.updateCellLockStatus(mCellWakeLockAcquired);
+            mNetworkLocationProvider.wakeLockAcquired();
         }
-
-        // Acquire wifi lock
-        WifiManager.WifiLock wifiLock = getWifiWakelockLocked();
-        if (wifiLock != null) {
-            if (mWifiWakeLockAcquired) {
-                // Lock is already acquired
-            } else if (mWifiManager.isWifiEnabled() && !mWakeLockNetworkReceived) {
-                wifiLock.acquire();
-                mWifiWakeLockAcquired = true;
-            } else {
-                mWifiWakeLockAcquired = false;
-                Log.w(TAG, "acquireWakeLock(): Unable to get WiFi lock");
-            }
-        }
-    }
-
-    private boolean reportGpsUidLocked(int curSeq, int nextSeq, int uid) {
-        int seq = mReportedGpsUids.get(uid, -1);
-        if (seq == curSeq) {
-            // Already reported; propagate to next sequence.
-            mReportedGpsUids.put(uid, nextSeq);
-            return true;
-        } else if (seq != nextSeq) {
-            try {
-                // New UID; report it.
-                mBatteryStats.noteStartGps(uid);
-                mReportedGpsUids.put(uid, nextSeq);
-                return true;
-            } catch (RemoteException e) {
-            }
-        }
-        return false;
-    }
-    
-    private void updateReportedGpsLocked() {
-        if (mGpsLocationProvider == null) {
-            return;
-        }
-        
-        final String name = mGpsLocationProvider.getName();
-        final int curSeq = mReportedGpsSeq;
-        final int nextSeq = (curSeq+1) >= 0 ? (curSeq+1) : 0;
-        mReportedGpsSeq = nextSeq;
-        
-        ArrayList<UpdateRecord> urs = mRecordsByProvider.get(name);
-        int num = 0;
-        final int N = urs.size();
-        for (int i=0; i<N; i++) {
-            UpdateRecord ur = urs.get(i);
-            if (ur.mReceiver == mProximityListener) {
-                // We don't want the system to take the blame for this one.
-                continue;
-            }
-            if (reportGpsUidLocked(curSeq, nextSeq, ur.mUid)) {
-                num++;
-            }
-        }
-        
-        for (ProximityAlert pe : mProximityAlerts.values()) {
-            if (reportGpsUidLocked(curSeq, nextSeq, pe.mUid)) {
-                num++;
-            }
-        }
-        
-        if (num != mReportedGpsUids.size()) {
-            // The number of uids is processed is different than the
-            // array; report any that are no longer active.
-            for (int i=mReportedGpsUids.size()-1; i>=0; i--) {
-                if (mReportedGpsUids.valueAt(i) != nextSeq) {
-                    try {
-                        mBatteryStats.noteStopGps(mReportedGpsUids.keyAt(i));
-                    } catch (RemoteException e) {
-                    }
-                    mReportedGpsUids.removeAt(i);
-                }
-            }
-        }
-    }
-    
-    private void reportStopGpsLocked() {
-        int curSeq = mReportedGpsSeq;
-        for (int i=mReportedGpsUids.size()-1; i>=0; i--) {
-            if (mReportedGpsUids.valueAt(i) == curSeq) {
-                try {
-                    mBatteryStats.noteStopGps(mReportedGpsUids.keyAt(i));
-                } catch (RemoteException e) {
-                }
-            }
-        }
-        curSeq++;
-        if (curSeq < 0) curSeq = 0;
-        mReportedGpsSeq = curSeq;
-        mReportedGpsUids.clear();
-    }
-    
-    private void startGpsLocked() {
-        boolean gpsActive = (mGpsLocationProvider != null)
-                    && mGpsLocationProvider.isLocationTracking();
-        if (gpsActive) {
-            mGpsLocationProvider.startNavigating();
-        }
-    }
-
-    private void stopGpsLocked() {
-        boolean gpsActive = mGpsLocationProvider != null
-                    && mGpsLocationProvider.isLocationTracking();
-        if (gpsActive) {
-            mGpsLocationProvider.stopNavigating();
+        if (mGpsLocationProvider != null) {
+            mGpsLocationProvider.wakeLockAcquired();
         }
     }
 
@@ -2036,29 +1819,11 @@ public class LocationManagerService extends ILocationManager.Stub {
     }
 
     private void releaseWakeLockXLocked() {
-        // Release wifi lock
-        WifiManager.WifiLock wifiLock = getWifiWakelockLocked();
-        if (wifiLock != null) {
-            if (mWifiWakeLockAcquired) {
-                wifiLock.release();
-                mWifiWakeLockAcquired = false;
-            }
-        }
-
-        if (!mScreenOn) {
-            // Stop the gps
-            stopGpsLocked();
-        }
-
-        // Release cell lock
-        if (mCellWakeLockAcquired) {
-            mTelephonyManager.disableLocationUpdates();
-            mCellWakeLockAcquired = false;
-        }
-
-        // Notify NetworkLocationProvider
         if (mNetworkLocationProvider != null) {
-            mNetworkLocationProvider.updateCellLockStatus(mCellWakeLockAcquired);
+            mNetworkLocationProvider.wakeLockReleased();
+        }
+        if (mGpsLocationProvider != null) {
+            mGpsLocationProvider.wakeLockReleased();
         }
 
         // Release wake lock
@@ -2074,30 +1839,34 @@ public class LocationManagerService extends ILocationManager.Stub {
     // Geocoder
 
     public String getFromLocation(double latitude, double longitude, int maxResults,
-        String language, String country, String variant, String appName, List<Address> addrs) {
-        synchronized (mLocationListeners) {
-            if (mNetworkLocationProvider != null) {
-                return mNetworkLocationProvider.getFromLocation(latitude, longitude, maxResults,
-                        language, country, variant, appName, addrs);
-            } else {
-                return null;
+            String language, String country, String variant, String appName, List<Address> addrs) {
+        if (mGeocodeProvider != null) {
+            try {
+                return mGeocodeProvider.getFromLocation(latitude, longitude, maxResults, language, country,
+                        variant, appName,  addrs);
+            } catch (RemoteException e) {
+                Log.e(TAG, "getFromLocation failed", e);
             }
         }
+        return null;
     }
 
+
     public String getFromLocationName(String locationName,
-        double lowerLeftLatitude, double lowerLeftLongitude,
-        double upperRightLatitude, double upperRightLongitude, int maxResults,
-        String language, String country, String variant, String appName, List<Address> addrs) {
-        synchronized (mLocationListeners) {
-            if (mNetworkLocationProvider != null) {
-                return mNetworkLocationProvider.getFromLocationName(locationName, lowerLeftLatitude, 
-                        lowerLeftLongitude, upperRightLatitude, upperRightLongitude, maxResults,
-                        language, country, variant, appName, addrs);
-            } else {
-                return null;
+            double lowerLeftLatitude, double lowerLeftLongitude,
+            double upperRightLatitude, double upperRightLongitude, int maxResults,
+            String language, String country, String variant, String appName, List<Address> addrs) {
+
+        if (mGeocodeProvider != null) {
+            try {
+                return mGeocodeProvider.getFromLocationName(locationName, lowerLeftLatitude,
+                        lowerLeftLongitude, upperRightLatitude, upperRightLongitude,
+                        maxResults, language, country, variant, appName, addrs);
+            } catch (RemoteException e) {
+                Log.e(TAG, "getFromLocationName failed", e);
             }
         }
+        return null;
     }
 
     // Mock Providers
@@ -2120,7 +1889,7 @@ public class LocationManagerService extends ILocationManager.Stub {
         boolean supportsSpeed, boolean supportsBearing, int powerRequirement, int accuracy) {
         checkMockPermissionsSafe();
 
-        synchronized (mLocationListeners) {
+        synchronized (mLock) {
             MockProvider provider = new MockProvider(name, this,
                 requiresNetwork, requiresSatellite,
                 requiresCell, hasMonetaryCost, supportsAltitude,
@@ -2136,7 +1905,7 @@ public class LocationManagerService extends ILocationManager.Stub {
 
     public void removeTestProvider(String provider) {
         checkMockPermissionsSafe();
-        synchronized (mLocationListeners) {
+        synchronized (mLock) {
             MockProvider mockProvider = mMockProviders.get(provider);
             if (mockProvider == null) {
                 throw new IllegalArgumentException("Provider \"" + provider + "\" unknown");
@@ -2149,7 +1918,7 @@ public class LocationManagerService extends ILocationManager.Stub {
 
     public void setTestProviderLocation(String provider, Location loc) {
         checkMockPermissionsSafe();
-        synchronized (mLocationListeners) {
+        synchronized (mLock) {
             MockProvider mockProvider = mMockProviders.get(provider);
             if (mockProvider == null) {
                 throw new IllegalArgumentException("Provider \"" + provider + "\" unknown");
@@ -2160,7 +1929,7 @@ public class LocationManagerService extends ILocationManager.Stub {
 
     public void clearTestProviderLocation(String provider) {
         checkMockPermissionsSafe();
-        synchronized (mLocationListeners) {
+        synchronized (mLock) {
             MockProvider mockProvider = mMockProviders.get(provider);
             if (mockProvider == null) {
                 throw new IllegalArgumentException("Provider \"" + provider + "\" unknown");
@@ -2171,7 +1940,7 @@ public class LocationManagerService extends ILocationManager.Stub {
 
     public void setTestProviderEnabled(String provider, boolean enabled) {
         checkMockPermissionsSafe();
-        synchronized (mLocationListeners) {
+        synchronized (mLock) {
             MockProvider mockProvider = mMockProviders.get(provider);
             if (mockProvider == null) {
                 throw new IllegalArgumentException("Provider \"" + provider + "\" unknown");
@@ -2191,7 +1960,7 @@ public class LocationManagerService extends ILocationManager.Stub {
 
     public void clearTestProviderEnabled(String provider) {
         checkMockPermissionsSafe();
-        synchronized (mLocationListeners) {
+        synchronized (mLock) {
             MockProvider mockProvider = mMockProviders.get(provider);
             if (mockProvider == null) {
                 throw new IllegalArgumentException("Provider \"" + provider + "\" unknown");
@@ -2204,7 +1973,7 @@ public class LocationManagerService extends ILocationManager.Stub {
 
     public void setTestProviderStatus(String provider, int status, Bundle extras, long updateTime) {
         checkMockPermissionsSafe();
-        synchronized (mLocationListeners) {
+        synchronized (mLock) {
             MockProvider mockProvider = mMockProviders.get(provider);
             if (mockProvider == null) {
                 throw new IllegalArgumentException("Provider \"" + provider + "\" unknown");
@@ -2215,7 +1984,7 @@ public class LocationManagerService extends ILocationManager.Stub {
 
     public void clearTestProviderStatus(String provider) {
         checkMockPermissionsSafe();
-        synchronized (mLocationListeners) {
+        synchronized (mLock) {
             MockProvider mockProvider = mMockProviders.get(provider);
             if (mockProvider == null) {
                 throw new IllegalArgumentException("Provider \"" + provider + "\" unknown");
@@ -2239,52 +2008,29 @@ public class LocationManagerService extends ILocationManager.Stub {
             return;
         }
         
-        synchronized (mLocationListeners) {
+        synchronized (mLock) {
             pw.println("Current Location Manager state:");
             pw.println("  sProvidersLoaded=" + sProvidersLoaded);
             pw.println("  mGpsLocationProvider=" + mGpsLocationProvider);
-            pw.println("  mGpsNavigating=" + mGpsNavigating);
             pw.println("  mNetworkLocationProvider=" + mNetworkLocationProvider);
             pw.println("  mCollector=" + mCollector);
             pw.println("  mAlarmInterval=" + mAlarmInterval
-                    + " mScreenOn=" + mScreenOn
                     + " mWakeLockAcquireTime=" + mWakeLockAcquireTime);
             pw.println("  mWakeLockGpsReceived=" + mWakeLockGpsReceived
                     + " mWakeLockNetworkReceived=" + mWakeLockNetworkReceived);
-            pw.println("  mWifiWakeLockAcquired=" + mWifiWakeLockAcquired
-                    + " mCellWakeLockAcquired=" + mCellWakeLockAcquired);
             pw.println("  Listeners:");
-            int N = mListeners.size();
+            int N = mReceivers.size();
             for (int i=0; i<N; i++) {
-                pw.println("    " + mListeners.get(i));
+                pw.println("    " + mReceivers.get(i));
             }
             pw.println("  Location Listeners:");
-            for (Map.Entry<Receiver, HashMap<String,UpdateRecord>> i
-                    : mLocationListeners.entrySet()) {
-                pw.println("    " + i.getKey() + ":");
-                for (Map.Entry<String,UpdateRecord> j : i.getValue().entrySet()) {
+            for (Receiver i : mReceivers.values()) {
+                pw.println("    " + i + ":");
+                for (Map.Entry<String,UpdateRecord> j : i.mUpdateRecords.entrySet()) {
                     pw.println("      " + j.getKey() + ":");
                     j.getValue().dump(pw, "        ");
                 }
             }
-            pw.println("  Last Fix Broadcasts:");
-            for (Map.Entry<Receiver, HashMap<String,Location>> i
-                    : mLastFixBroadcast.entrySet()) {
-                pw.println("    " + i.getKey() + ":");
-                for (Map.Entry<String,Location> j : i.getValue().entrySet()) {
-                    pw.println("      " + j.getKey() + ":");
-                    j.getValue().dump(new PrintWriterPrinter(pw), "        ");
-                }
-            }
-            pw.println("  Last Status Broadcasts:");
-            for (Map.Entry<Receiver, HashMap<String,Long>> i
-                    : mLastStatusBroadcast.entrySet()) {
-                pw.println("    " + i.getKey() + ":");
-                for (Map.Entry<String,Long> j : i.getValue().entrySet()) {
-                    pw.println("      " + j.getKey() + " -> 0x"
-                            + Long.toHexString(j.getValue()));
-                }
-            }
             pw.println("  Records by Provider:");
             for (Map.Entry<String, ArrayList<UpdateRecord>> i
                     : mRecordsByProvider.entrySet()) {
@@ -2336,12 +2082,6 @@ public class LocationManagerService extends ILocationManager.Stub {
                     i.getValue().dump(pw, "      ");
                 }
             }
-            pw.println("  Reported GPS UIDs @ seq " + mReportedGpsSeq + ":");
-            N = mReportedGpsUids.size();
-            for (int i=0; i<N; i++)  {
-                pw.println("    UID " + mReportedGpsUids.keyAt(i)
-                        + " seq=" + mReportedGpsUids.valueAt(i));
-            }
         }
     }
 }
diff --git a/services/java/com/android/server/WifiService.java b/services/java/com/android/server/WifiService.java
index 54e77f022238..8850c3123e22 100644
--- a/services/java/com/android/server/WifiService.java
+++ b/services/java/com/android/server/WifiService.java
@@ -165,7 +165,6 @@ public class WifiService extends IWifiManager.Stub {
      * Character buffer used to parse scan results (optimization)
      */
     private static final int SCAN_RESULT_BUFFER_SIZE = 512;
-    private char[] mScanResultBuffer;
     private boolean mNeedReconfig;
 
     /*
@@ -204,8 +203,6 @@ public class WifiService extends IWifiManager.Stub {
                 }
             };
 
-        mScanResultBuffer = new char [SCAN_RESULT_BUFFER_SIZE];
-
         HandlerThread wifiThread = new HandlerThread("WifiService");
         wifiThread.start();
         mWifiHandler = new WifiHandler(wifiThread.getLooper());
@@ -1217,61 +1214,13 @@ public class WifiService extends IWifiManager.Stub {
                     lineBeg = lineEnd + 1;
                     continue;
                 }
-                int lineLen = lineEnd - lineBeg;
-                if (0 < lineLen && lineLen <= SCAN_RESULT_BUFFER_SIZE) {
-                    int scanResultLevel = 0;
-                    /*
-                     * At most one thread should have access to the buffer at a time!
-                     */
-                    synchronized(mScanResultBuffer) {
-                        boolean parsingScanResultLevel = false;
-                        for (int i = lineBeg; i < lineEnd; ++i) {
-                            char ch = reply.charAt(i);
-                            /*
-                             * Assume that the signal level starts with a '-'
-                             */
-                            if (ch == '-') {
-                                /*
-                                 * Skip whatever instances of '-' we may have
-                                 * after we parse the signal level
-                                 */
-                                parsingScanResultLevel = (scanResultLevel == 0);
-                            } else if (parsingScanResultLevel) {
-                                int digit = Character.digit(ch, 10);
-                                if (0 <= digit) {
-                                    scanResultLevel =
-                                        10 * scanResultLevel + digit;
-                                    /*
-                                     * Replace the signal level number in
-                                     * the string with 0's for caching
-                                     */
-                                    ch = '0';
-                                } else {
-                                    /*
-                                     * Reset the flag if we meet a non-digit
-                                     * character
-                                     */
-                                    parsingScanResultLevel = false;
-                                }
-                            }
-                            mScanResultBuffer[i - lineBeg] = ch;
-                        }
-                        if (scanResultLevel != 0) {
-                            ScanResult scanResult = parseScanResult(
-                                new String(mScanResultBuffer, 0, lineLen));
-                            if (scanResult != null) {
-                              scanResult.level = -scanResultLevel;
-                              scanList.add(scanResult);
-                            }
-                        } else if (DBG) {
-                            Log.w(TAG,
-                                  "ScanResult.level=0: misformatted scan result?");
-                        }
-                    }
-                } else if (0 < lineLen) {
-                    if (DBG) {
-                        Log.w(TAG, "Scan result line is too long: " +
-                              (lineEnd - lineBeg) + ", skipping the line!");
+                if (lineEnd > lineBeg) {
+                    String line = reply.substring(lineBeg, lineEnd);
+                    ScanResult scanResult = parseScanResult(line);
+                    if (scanResult != null) {
+                        scanList.add(scanResult);
+                    } else if (DBG) {
+                        Log.w(TAG, "misformatted scan result for: " + line);
                     }
                 }
                 lineBeg = lineEnd + 1;
@@ -1294,21 +1243,29 @@ public class WifiService extends IWifiManager.Stub {
              * must synchronized here!
              */
             synchronized (mScanResultCache) {
-                scanResult = mScanResultCache.get(line);
-                if (scanResult == null) {
-                    String[] result = scanResultPattern.split(line);
-                    if (3 <= result.length && result.length <= 5) {
-                        // bssid | frequency | level | flags | ssid
-                        int frequency;
-                        int level;
-                        try {
-                            frequency = Integer.parseInt(result[1]);
-                            level = Integer.parseInt(result[2]);
-                        } catch (NumberFormatException e) {
-                            frequency = 0;
-                            level = 0;
-                        }
+                String[] result = scanResultPattern.split(line);
+                if (3 <= result.length && result.length <= 5) {
+                    String bssid = result[0];
+                    // bssid | frequency | level | flags | ssid
+                    int frequency;
+                    int level;
+                    try {
+                        frequency = Integer.parseInt(result[1]);
+                        level = Integer.parseInt(result[2]);
+                        /* some implementations avoid negative values by adding 256
+                         * so we need to adjust for that here.
+                         */
+                        if (level > 0) level -= 256;
+                    } catch (NumberFormatException e) {
+                        frequency = 0;
+                        level = 0;
+                    }
 
+                    // bssid is the hash key
+                    scanResult = mScanResultCache.get(bssid);
+                    if (scanResult != null) {
+                        scanResult.level = level;
+                    } else {
                         /*
                          * The formatting of the results returned by
                          * wpa_supplicant is intended to make the fields
@@ -1341,13 +1298,13 @@ public class WifiService extends IWifiManager.Stub {
                         if (0 < ssid.trim().length()) {
                             scanResult =
                                 new ScanResult(
-                                    ssid, result[0], flags, level, frequency);
-                            mScanResultCache.put(line, scanResult);
+                                    ssid, bssid, flags, level, frequency);
+                            mScanResultCache.put(bssid, scanResult);
                         }
-                    } else {
-                        Log.w(TAG, "Misformatted scan result text with " +
-                              result.length + " fields: " + line);
                     }
+                } else {
+                    Log.w(TAG, "Misformatted scan result text with " +
+                          result.length + " fields: " + line);
                 }
             }
         }
diff --git a/services/java/com/android/server/WifiWatchdogService.java b/services/java/com/android/server/WifiWatchdogService.java
index fe97b9327305..9443a958199a 100644
--- a/services/java/com/android/server/WifiWatchdogService.java
+++ b/services/java/com/android/server/WifiWatchdogService.java
@@ -75,14 +75,6 @@ public class WifiWatchdogService {
     private static final boolean V = false || Config.LOGV;
     private static final boolean D = true || Config.LOGD;
     
-    /*
-     * When this was "net.dns1", sometimes the mobile data's DNS was seen
-     * instead due to a race condition. All we really care about is the
-     * DHCP-replied DNS server anyway.
-     */
-    /** The system property whose value provides the current DNS address. */
-    private static final String SYSTEMPROPERTY_KEY_DNS = "dhcp.tiwlan0.dns1";
-
     private Context mContext;
     private ContentResolver mContentResolver;
     private WifiStateTracker mWifiStateTracker;
diff --git a/services/java/com/android/server/WindowManagerService.java b/services/java/com/android/server/WindowManagerService.java
index 0b1ddc846be5..b0fcb1c0f55b 100644
--- a/services/java/com/android/server/WindowManagerService.java
+++ b/services/java/com/android/server/WindowManagerService.java
@@ -77,7 +77,6 @@ import android.os.SystemClock;
 import android.os.SystemProperties;
 import android.os.TokenWatcher;
 import android.provider.Settings;
-import android.util.Config;
 import android.util.EventLog;
 import android.util.Log;
 import android.util.SparseIntArray;
@@ -137,7 +136,7 @@ public class WindowManagerService extends IWindowManager.Stub implements Watchdo
     
     static final boolean PROFILE_ORIENTATION = false;
     static final boolean BLUR = true;
-    static final boolean localLOGV = DEBUG ? Config.LOGD : Config.LOGV;
+    static final boolean localLOGV = DEBUG;
     
     static final int LOG_WM_NO_SURFACE_MEMORY = 31000;
     
@@ -2023,7 +2022,7 @@ public class WindowManagerService extends IWindowManager.Stub implements Watchdo
             wtoken.appFullscreen = fullscreen;
             wtoken.requestedOrientation = requestedOrientation;
             mAppTokens.add(addPos, wtoken);
-            if (Config.LOGV) Log.v(TAG, "Adding new app token: " + wtoken);
+            if (localLOGV) Log.v(TAG, "Adding new app token: " + wtoken);
             mTokenMap.put(token.asBinder(), wtoken);
             mTokenList.add(wtoken);
             
@@ -4801,14 +4800,11 @@ public class WindowManagerService extends IWindowManager.Stub implements Watchdo
                     mPaused = true;
                 } else {
                     if (mLastWin == null) {
-                        if (Config.LOGI) Log.i(
-                            TAG, "Key dispatching not paused: no last window.");
+                        Log.i(TAG, "Key dispatching not paused: no last window.");
                     } else if (mFinished) {
-                        if (Config.LOGI) Log.i(
-                            TAG, "Key dispatching not paused: finished last key.");
+                        Log.i(TAG, "Key dispatching not paused: finished last key.");
                     } else {
-                        if (Config.LOGI) Log.i(
-                            TAG, "Key dispatching not paused: window in higher layer.");
+                        Log.i(TAG, "Key dispatching not paused: window in higher layer.");
                     }
                 }
                 */
@@ -7423,7 +7419,7 @@ public class WindowManagerService extends IWindowManager.Stub implements Watchdo
     private boolean mInLayout = false;
     private final void performLayoutAndPlaceSurfacesLocked() {
         if (mInLayout) {
-            if (Config.DEBUG) {
+            if (DEBUG) {
                 throw new RuntimeException("Recursive call!");
             }
             Log.w(TAG, "performLayoutAndPlaceSurfacesLocked called while in layout");
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java
index d676c00b952e..a3c23d3f3af6 100644
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -682,6 +682,11 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
     HashMap<String, IBinder> mAppBindArgs;
 
     /**
+     * Temporary to avoid allocations.  Protected by main lock.
+     */
+    final StringBuilder mStringBuilder = new StringBuilder(256);
+    
+    /**
      * Used to control how we initialize the service.
      */
     boolean mStartRunning = false;
@@ -778,6 +783,8 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
     long mLastCpuTime = 0;
     long mLastWriteTime = 0;
 
+    long mInitialStartTime = 0;
+    
     /**
      * Set to true after the system has finished booting.
      */
@@ -1270,7 +1277,7 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
         mBatteryStatsService.getActiveStatistics().writeLocked();
         
         mUsageStatsService = new UsageStatsService( new File(
-                systemDir, "usagestats.bin").toString());
+                systemDir, "usagestats").toString());
 
         mConfiguration.makeDefault();
         mProcessStats.init();
@@ -1635,6 +1642,11 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
         
         if (r.startTime == 0) {
             r.startTime = SystemClock.uptimeMillis();
+            if (mInitialStartTime == 0) {
+                mInitialStartTime = r.startTime;
+            }
+        } else if (mInitialStartTime == 0) {
+            mInitialStartTime = SystemClock.uptimeMillis();
         }
         
         if (app != null && app.thread != null) {
@@ -1785,7 +1797,8 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
                 Watchdog.getInstance().processStarted(app, app.processName, pid);
             }
             
-            StringBuilder buf = new StringBuilder(128);
+            StringBuilder buf = mStringBuilder;
+            buf.setLength(0);
             buf.append("Start proc ");
             buf.append(app.processName);
             buf.append(" for ");
@@ -2813,7 +2826,6 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
         HistoryRecord r = new HistoryRecord(this, callerApp, callingUid,
                 intent, resolvedType, aInfo, mConfiguration,
                 resultRecord, resultWho, requestCode, componentSpecified);
-        r.startTime = SystemClock.uptimeMillis();
 
         HistoryRecord notTop = (launchFlags&Intent.FLAG_ACTIVITY_PREVIOUS_IS_TOP)
                 != 0 ? r : null;
@@ -4095,7 +4107,8 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
             }
         }
 
-        StringBuilder info = new StringBuilder();
+        StringBuilder info = mStringBuilder;
+        info.setLength(0);
         info.append("ANR (application not responding) in process: ");
         info.append(app.processName);
         if (annotation != null) {
@@ -4517,7 +4530,7 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
             }
         } else if (mStartingProcesses.size() > 0) {
             app = mStartingProcesses.remove(0);
-            app.pid = pid;
+            app.setPid(pid);
         } else {
             app = null;
         }
@@ -7877,24 +7890,24 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
                 return;
             }
             pw.println("Activities in Current Activity Manager State:");
-            dumpHistoryList(pw, mHistory, "  ", "History");
+            dumpHistoryList(pw, mHistory, "  ", "History", true);
             pw.println(" ");
             pw.println("  Running activities (most recent first):");
-            dumpHistoryList(pw, mLRUActivities, "  ", "Running");
+            dumpHistoryList(pw, mLRUActivities, "  ", "Running", false);
             if (mWaitingVisibleActivities.size() > 0) {
                 pw.println(" ");
                 pw.println("  Activities waiting for another to become visible:");
-                dumpHistoryList(pw, mWaitingVisibleActivities, "  ", "Waiting");
+                dumpHistoryList(pw, mWaitingVisibleActivities, "  ", "Waiting", false);
             }
             if (mStoppingActivities.size() > 0) {
                 pw.println(" ");
                 pw.println("  Activities waiting to stop:");
-                dumpHistoryList(pw, mStoppingActivities, "  ", "Stopping");
+                dumpHistoryList(pw, mStoppingActivities, "  ", "Stopping", false);
             }
             if (mFinishingActivities.size() > 0) {
                 pw.println(" ");
                 pw.println("  Activities waiting to finish:");
-                dumpHistoryList(pw, mFinishingActivities, "  ", "Finishing");
+                dumpHistoryList(pw, mFinishingActivities, "  ", "Finishing", false);
             }
 
             pw.println(" ");
@@ -7931,8 +7944,8 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
                         needSep = true;
                     }
                     ProcessRecord r = procs.valueAt(ia);
-                    pw.println((r.persistent ? "  *PERSISTENT* Process [" : "  Process [")
-                            + r.processName + "] UID " + procs.keyAt(ia));
+                    pw.print(r.persistent ? "  *PERSISTENT* Process [" : "  Process [");
+                    pw.print(r.processName); pw.print("] UID "); pw.println(procs.keyAt(ia));
                     r.dump(pw, "    ");
                     if (r.persistent) {
                         numPers++;
@@ -8360,16 +8373,29 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
     }
 
     private static final void dumpHistoryList(PrintWriter pw, List list,
-            String prefix, String label) {
+            String prefix, String label, boolean complete) {
         TaskRecord lastTask = null;
         for (int i=list.size()-1; i>=0; i--) {
             HistoryRecord r = (HistoryRecord)list.get(i);
             if (lastTask != r.task) {
                 lastTask = r.task;
-                lastTask.dump(pw, prefix + "  ");
+                if (complete || !r.inHistory) {
+                    lastTask.dump(pw, prefix + "  ");
+                } else {
+                    pw.print(prefix);
+                    pw.print("  ");
+                    pw.println(lastTask);
+                }
+            }
+            if (complete || !r.inHistory) {
+                pw.print(prefix); pw.print("    "); pw.print(label);
+                        pw.print(" #"); pw.print(i); pw.println(":");
+                r.dump(pw, prefix + "      ");
+            } else {
+                pw.print(prefix); pw.print("    "); pw.print(label);
+                        pw.print(" #"); pw.print(i); pw.print(": ");
+                        pw.println(r);
             }
-            pw.println(prefix + "    " + label + " #" + i + ":");
-            r.dump(pw, prefix + "      ");
         }
     }
 
@@ -8401,7 +8427,7 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
 
     private static final void dumpApplicationMemoryUsage(FileDescriptor fd,
             PrintWriter pw, List list, String prefix, String[] args) {
-        final boolean isCheckinRequest = scanArgs(args, "-c");
+        final boolean isCheckinRequest = scanArgs(args, "--checkin");
         long uptime = SystemClock.uptimeMillis();
         long realtime = SystemClock.elapsedRealtime();
         
@@ -8738,7 +8764,7 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
                 mPidsSelfLocked.remove(app.pid);
                 mHandler.removeMessages(PROC_START_TIMEOUT_MSG, app);
             }
-            app.pid = 0;
+            app.setPid(0);
         }
     }
 
diff --git a/services/java/com/android/server/am/BatteryStatsService.java b/services/java/com/android/server/am/BatteryStatsService.java
index c5907afbd967..e265f43046ca 100644
--- a/services/java/com/android/server/am/BatteryStatsService.java
+++ b/services/java/com/android/server/am/BatteryStatsService.java
@@ -295,7 +295,7 @@ public final class BatteryStatsService extends IBatteryStats.Stub {
             boolean isCheckin = false;
             if (args != null) {
                 for (String arg : args) {
-                    if ("-c".equals(arg)) {
+                    if ("--checkin".equals(arg)) {
                         isCheckin = true;
                         break;
                     }
diff --git a/services/java/com/android/server/am/ConnectionRecord.java b/services/java/com/android/server/am/ConnectionRecord.java
index 41a783f67b04..b4c7df1f5498 100644
--- a/services/java/com/android/server/am/ConnectionRecord.java
+++ b/services/java/com/android/server/am/ConnectionRecord.java
@@ -28,7 +28,8 @@ class ConnectionRecord {
     final HistoryRecord activity;   // If non-null, the owning activity.
     final IServiceConnection conn;  // The client connection.
     final int flags;                // Binding options.
-
+    String stringName;              // Caching of toString.
+    
     void dump(PrintWriter pw, String prefix) {
         pw.println(prefix + this);
         pw.println(prefix + "binding=" + binding);
@@ -46,9 +47,17 @@ class ConnectionRecord {
     }
 
     public String toString() {
-        return "ConnectionRecord{"
-            + Integer.toHexString(System.identityHashCode(this))
-            + " " + binding.service.shortName
-            + ":@" + Integer.toHexString(System.identityHashCode(conn.asBinder())) + "}";
+        if (stringName != null) {
+            return stringName;
+        }
+        StringBuilder sb = new StringBuilder(128);
+        sb.append("ConnectionRecord{");
+        sb.append(Integer.toHexString(System.identityHashCode(this)));
+        sb.append(' ');
+        sb.append(binding.service.shortName);
+        sb.append(":@");
+        sb.append(Integer.toHexString(System.identityHashCode(conn.asBinder())));
+        sb.append('}');
+        return stringName = sb.toString();
     }
 }
diff --git a/services/java/com/android/server/am/ContentProviderRecord.java b/services/java/com/android/server/am/ContentProviderRecord.java
index 9f37c140bcbe..2b9e0060ef82 100644
--- a/services/java/com/android/server/am/ContentProviderRecord.java
+++ b/services/java/com/android/server/am/ContentProviderRecord.java
@@ -32,7 +32,8 @@ class ContentProviderRecord extends ContentProviderHolder {
     int externals;     // number of non-framework processes supported by this provider
     ProcessRecord app; // if non-null, hosting application
     ProcessRecord launchingApp; // if non-null, waiting for this app to be launched.
-
+    String stringName;
+    
     public ContentProviderRecord(ProviderInfo _info, ApplicationInfo ai) {
         super(_info);
         uid = ai.uid;
@@ -69,8 +70,15 @@ class ContentProviderRecord extends ContentProviderHolder {
     }
 
     public String toString() {
-        return "ContentProviderRecord{"
-            + Integer.toHexString(System.identityHashCode(this))
-            + " " + info.name + "}";
+        if (stringName != null) {
+            return stringName;
+        }
+        StringBuilder sb = new StringBuilder(128);
+        sb.append("ContentProviderRecord{");
+        sb.append(Integer.toHexString(System.identityHashCode(this)));
+        sb.append(' ');
+        sb.append(info.name);
+        sb.append('}');
+        return stringName = sb.toString();
     }
 }
diff --git a/services/java/com/android/server/am/HistoryRecord.java b/services/java/com/android/server/am/HistoryRecord.java
index 0f62471ed7d3..a2fd62bacc96 100644
--- a/services/java/com/android/server/am/HistoryRecord.java
+++ b/services/java/com/android/server/am/HistoryRecord.java
@@ -100,46 +100,74 @@ class HistoryRecord extends IApplicationToken.Stub {
     boolean hasBeenLaunched;// has this activity ever been launched?
     boolean frozenBeforeDestroy;// has been frozen but not yet destroyed.
 
+    String stringName;      // for caching of toString().
+    
     void dump(PrintWriter pw, String prefix) {
-        pw.println(prefix + this);
-        pw.println(prefix + "packageName=" + packageName
-              + " processName=" + processName);
-        pw.println(prefix + "launchedFromUid=" + launchedFromUid
-                + " app=" + app);
-        pw.println(prefix + intent);
-        pw.println(prefix + "frontOfTask=" + frontOfTask + " task=" + task);
-        pw.println(prefix + "taskAffinity=" + taskAffinity);
-        pw.println(prefix + "realActivity=" + realActivity);
-        pw.println(prefix + "dir=" + baseDir + " res=" + resDir + " data=" + dataDir);
-        pw.println(prefix + "labelRes=0x" + Integer.toHexString(labelRes)
-                + " icon=0x" + Integer.toHexString(icon)
-                + " theme=0x" + Integer.toHexString(theme));
-        pw.println(prefix + "stateNotNeeded=" + stateNotNeeded
-                + " componentSpecified=" + componentSpecified
-                + " isHomeActivity=" + isHomeActivity);
-        pw.println(prefix + "configuration=" + configuration);
-        pw.println(prefix + "resultTo=" + resultTo
-              + " resultWho=" + resultWho + " resultCode=" + requestCode);
-        pw.println(prefix + "results=" + results);
-        pw.println(prefix + "pendingResults=" + pendingResults);
-        pw.println(prefix + "readUriPermissions=" + readUriPermissions);
-        pw.println(prefix + "writeUriPermissions=" + writeUriPermissions);
-        pw.println(prefix + "launchFailed=" + launchFailed
-              + " haveState=" + haveState + " icicle=" + icicle);
-        pw.println(prefix + "state=" + state
-              + " stopped=" + stopped + " finishing=" + finishing);
-        pw.println(prefix + "keysPaused=" + keysPaused
-              + " inHistory=" + inHistory + " persistent=" + persistent
-              + " launchMode=" + launchMode);
-        pw.println(prefix + "fullscreen=" + fullscreen
-              + " visible=" + visible
-              + " frozenBeforeDestroy=" + frozenBeforeDestroy
-              + " thumbnailNeeded=" + thumbnailNeeded + " idle=" + idle);
-        pw.println(prefix + "waitingVisible=" + waitingVisible
-              + " nowVisible=" + nowVisible);
-        pw.println(prefix + "configDestroy=" + configDestroy
-                + " configChangeFlags=" + Integer.toHexString(configChangeFlags));
-        pw.println(prefix + "connections=" + connections);
+        pw.print(prefix); pw.println(this);
+        pw.print(prefix); pw.print("packageName="); pw.print(packageName);
+                pw.print(" processName="); pw.println(processName);
+        pw.print(prefix); pw.print("launchedFromUid="); pw.print(launchedFromUid);
+                pw.print(" app="); pw.println(app);
+        pw.print(prefix); pw.println(intent);
+        pw.print(prefix); pw.print("frontOfTask="); pw.print(frontOfTask);
+                pw.print(" task="); pw.println(task);
+        pw.print(prefix); pw.print("taskAffinity="); pw.println(taskAffinity);
+        pw.print(prefix); pw.print("realActivity="); pw.println(realActivity);
+        pw.print(prefix); pw.print("dir="); pw.print(baseDir);
+                pw.print(" res="); pw.print(resDir);
+                pw.print(" data="); pw.println(dataDir);
+        pw.print(prefix); pw.print("labelRes=0x");
+                pw.print(Integer.toHexString(labelRes));
+                pw.print(" icon=0x"); pw.print(Integer.toHexString(icon));
+                pw.print(" theme=0x"); pw.println(Integer.toHexString(theme));
+        pw.print(prefix); pw.print("stateNotNeeded="); pw.print(stateNotNeeded);
+                pw.print(" componentSpecified="); pw.print(componentSpecified);
+                pw.print(" isHomeActivity="); pw.println(isHomeActivity);
+        pw.print(prefix); pw.print("configuration="); pw.println(configuration);
+        if (resultTo != null || resultWho != null) {
+            pw.print(prefix); pw.print("resultTo="); pw.print(resultTo);
+                    pw.print(" resultWho="); pw.print(resultWho);
+                    pw.print(" resultCode="); pw.println(requestCode);
+        }
+        if (results != null) {
+            pw.print(prefix); pw.print("results="); pw.println(results);
+        }
+        if (pendingResults != null) {
+            pw.print(prefix); pw.print("pendingResults="); pw.println(pendingResults);
+        }
+        if (readUriPermissions != null) {
+            pw.print(prefix); pw.print("readUriPermissions="); pw.println(readUriPermissions);
+        }
+        if (writeUriPermissions != null) {
+            pw.print(prefix); pw.print("writeUriPermissions="); pw.println(writeUriPermissions);
+        }
+        pw.print(prefix); pw.print("launchFailed="); pw.print(launchFailed);
+                pw.print(" haveState="); pw.print(haveState);
+                pw.print(" icicle="); pw.println(icicle);
+        pw.print(prefix); pw.print("state="); pw.print(state);
+                pw.print(" stopped="); pw.print(stopped);
+                pw.print(" finishing="); pw.println(finishing);
+        pw.print(prefix); pw.print("keysPaused="); pw.print(keysPaused);
+                pw.print(" inHistory="); pw.print(inHistory);
+                pw.print(" persistent="); pw.print(persistent);
+                pw.print(" launchMode="); pw.println(launchMode);
+        pw.print(prefix); pw.print("fullscreen="); pw.print(fullscreen);
+                pw.print(" visible="); pw.print(visible);
+                pw.print(" frozenBeforeDestroy="); pw.print(frozenBeforeDestroy);
+                pw.print(" thumbnailNeeded="); pw.print(thumbnailNeeded);
+                pw.print(" idle="); pw.println(idle);
+        if (waitingVisible || nowVisible) {
+            pw.print(prefix); pw.print("waitingVisible="); pw.print(waitingVisible);
+                    pw.print(" nowVisible="); pw.println(nowVisible);
+        }
+        if (configDestroy || configChangeFlags != 0) {
+            pw.print(prefix); pw.print("configDestroy="); pw.print(configDestroy);
+                    pw.print(" configChangeFlags=");
+                    pw.println(Integer.toHexString(configChangeFlags));
+        }
+        if (connections != null) {
+            pw.print(prefix); pw.print("connections="); pw.println(connections);
+        }
     }
 
     HistoryRecord(ActivityManagerService _service, ProcessRecord _caller,
@@ -335,15 +363,31 @@ class HistoryRecord extends IApplicationToken.Stub {
     
     public void windowsVisible() {
         synchronized(service) {
-            if (ActivityManagerService.SHOW_ACTIVITY_START_TIME
-                    && startTime != 0) {
-                long time = SystemClock.uptimeMillis() - startTime;
-                EventLog.writeEvent(ActivityManagerService.LOG_ACTIVITY_LAUNCH_TIME,
-                        System.identityHashCode(this), shortComponentName, time);
-                Log.i(ActivityManagerService.TAG, "Displayed activity "
-                        + shortComponentName
-                        + ": " + time + " ms");
+            if (startTime != 0) {
+                final long curTime = SystemClock.uptimeMillis();
+                final long thisTime = curTime - startTime;
+                final long totalTime = service.mInitialStartTime != 0
+                        ? (curTime - service.mInitialStartTime) : thisTime;
+                if (ActivityManagerService.SHOW_ACTIVITY_START_TIME) {
+                    EventLog.writeEvent(ActivityManagerService.LOG_ACTIVITY_LAUNCH_TIME,
+                            System.identityHashCode(this), shortComponentName,
+                            thisTime, totalTime);
+                    StringBuilder sb = service.mStringBuilder;
+                    sb.setLength(0);
+                    sb.append("Displayed activity ");
+                    sb.append(shortComponentName);
+                    sb.append(": ");
+                    sb.append(thisTime);
+                    sb.append(" ms (total ");
+                    sb.append(totalTime);
+                    sb.append(" ms)");
+                    Log.i(ActivityManagerService.TAG, sb.toString());
+                }
+                if (totalTime > 0) {
+                    service.mUsageStatsService.noteLaunchTime(realActivity, (int)totalTime);
+                }
                 startTime = 0;
+                service.mInitialStartTime = 0;
             }
             if (ActivityManagerService.DEBUG_SWITCH) Log.v(
                     ActivityManagerService.TAG, "windowsVisible(): " + this);
@@ -453,8 +497,15 @@ class HistoryRecord extends IApplicationToken.Stub {
     
     
     public String toString() {
-        return "HistoryRecord{"
-            + Integer.toHexString(System.identityHashCode(this))
-            + " " + intent.getComponent().toShortString() + "}";
+        if (stringName != null) {
+            return stringName;
+        }
+        StringBuilder sb = new StringBuilder(128);
+        sb.append("HistoryRecord{");
+        sb.append(Integer.toHexString(System.identityHashCode(this)));
+        sb.append(' ');
+        sb.append(intent.getComponent().toShortString());
+        sb.append('}');
+        return stringName = sb.toString();
     }
 }
diff --git a/services/java/com/android/server/am/ProcessRecord.java b/services/java/com/android/server/am/ProcessRecord.java
index a1320dfec15a..d2667e7a837c 100644
--- a/services/java/com/android/server/am/ProcessRecord.java
+++ b/services/java/com/android/server/am/ProcessRecord.java
@@ -98,44 +98,82 @@ class ProcessRecord implements Watchdog.PssRequestor {
     boolean waitedForDebugger;  // has process show wait for debugger dialog?
     Dialog waitDialog;          // current wait for debugger dialog
     
+    String stringName;          // caching of toString() result.
+    
     // These reports are generated & stored when an app gets into an error condition.
     // They will be "null" when all is OK.
     ActivityManager.ProcessErrorStateInfo crashingReport;
     ActivityManager.ProcessErrorStateInfo notRespondingReport;
 
     void dump(PrintWriter pw, String prefix) {
-        pw.println(prefix + this);
-        pw.println(prefix + "class=" + info.className);
-        pw.println(prefix+"manageSpaceActivityName="+info.manageSpaceActivityName);
-        pw.println(prefix + "dir=" + info.sourceDir + " publicDir=" + info.publicSourceDir 
-              + " data=" + info.dataDir);
-        pw.println(prefix + "packageList=" + pkgList);
-        pw.println(prefix + "instrumentationClass=" + instrumentationClass
-              + " instrumentationProfileFile=" + instrumentationProfileFile);
-        pw.println(prefix + "instrumentationArguments=" + instrumentationArguments);
-        pw.println(prefix + "thread=" + thread + " curReceiver=" + curReceiver);
-        pw.println(prefix + "pid=" + pid + " starting=" + starting
-                + " lastPss=" + lastPss);
-        pw.println(prefix + "maxAdj=" + maxAdj + " hiddenAdj=" + hiddenAdj
-                + " curRawAdj=" + curRawAdj + " setRawAdj=" + setRawAdj
-                + " curAdj=" + curAdj + " setAdj=" + setAdj);
-        pw.println(prefix + "isForeground=" + isForeground
-                + " setIsForeground=" + setIsForeground
-                + " foregroundServices=" + foregroundServices
-                + " forcingToForeground=" + forcingToForeground);
-        pw.println(prefix + "persistent=" + persistent + " removed=" + removed
-                + " persistentActivities=" + persistentActivities);
-        pw.println(prefix + "debugging=" + debugging
-                + " crashing=" + crashing + " " + crashDialog
-                + " notResponding=" + notResponding + " " + anrDialog
-                + " bad=" + bad);
-        pw.println(prefix + "activities=" + activities);
-        pw.println(prefix + "services=" + services);
-        pw.println(prefix + "executingServices=" + executingServices);
-        pw.println(prefix + "connections=" + connections);
-        pw.println(prefix + "pubProviders=" + pubProviders);
-        pw.println(prefix + "conProviders=" + conProviders);
-        pw.println(prefix + "receivers=" + receivers);
+        pw.print(prefix); pw.println(this);
+        if (info.className != null) {
+            pw.print(prefix); pw.print("class="); pw.println(info.className);
+        }
+        if (info.manageSpaceActivityName != null) {
+            pw.print(prefix); pw.print("manageSpaceActivityName=");
+            pw.println(info.manageSpaceActivityName);
+        }
+        pw.print(prefix); pw.print("dir="); pw.print(info.sourceDir);
+                pw.print(" publicDir="); pw.print(info.publicSourceDir);
+                pw.print(" data="); pw.println(info.dataDir);
+        pw.print(prefix); pw.print("packageList="); pw.println(pkgList);
+        if (instrumentationClass != null || instrumentationProfileFile != null
+                || instrumentationArguments != null) {
+            pw.print(prefix); pw.print("instrumentationClass=");
+                    pw.print(instrumentationClass);
+                    pw.print(" instrumentationProfileFile=");
+                    pw.println(instrumentationProfileFile);
+            pw.print(prefix); pw.print("instrumentationArguments=");
+                    pw.println(instrumentationArguments);
+        }
+        pw.print(prefix); pw.print("thread="); pw.print(thread);
+                pw.print(" curReceiver="); pw.println(curReceiver);
+        pw.print(prefix); pw.print("pid="); pw.print(pid); pw.print(" starting=");
+                pw.print(starting); pw.print(" lastPss="); pw.println(lastPss);
+        pw.print(prefix); pw.print("oom: max="); pw.print(maxAdj);
+                pw.print(" hidden="); pw.print(hiddenAdj);
+                pw.print(" curRaw="); pw.print(curRawAdj);
+                pw.print(" setRaw="); pw.print(setRawAdj);
+                pw.print(" cur="); pw.print(curAdj);
+                pw.print(" set="); pw.println(setAdj);
+        pw.print(prefix); pw.print("isForeground="); pw.print(isForeground);
+                pw.print(" setIsForeground="); pw.print(setIsForeground);
+                pw.print(" foregroundServices="); pw.print(foregroundServices);
+                pw.print(" forcingToForeground="); pw.println(forcingToForeground);
+        pw.print(prefix); pw.print("persistent="); pw.print(persistent);
+                pw.print(" removed="); pw.print(removed);
+                pw.print(" persistentActivities="); pw.println(persistentActivities);
+        if (debugging || crashing || crashDialog != null || notResponding
+                || anrDialog != null || bad) {
+            pw.print(prefix); pw.print("debugging="); pw.print(debugging);
+                    pw.print(" crashing="); pw.print(crashing);
+                    pw.print(" "); pw.print(crashDialog);
+                    pw.print(" notResponding="); pw.print(notResponding);
+                    pw.print(" " ); pw.print(anrDialog);
+                    pw.print(" bad="); pw.println(bad);
+        }
+        if (activities.size() > 0) {
+            pw.print(prefix); pw.print("activities="); pw.println(activities);
+        }
+        if (services.size() > 0) {
+            pw.print(prefix); pw.print("services="); pw.println(services);
+        }
+        if (executingServices.size() > 0) {
+            pw.print(prefix); pw.print("executingServices="); pw.println(executingServices);
+        }
+        if (connections.size() > 0) {
+            pw.print(prefix); pw.print("connections="); pw.println(connections);
+        }
+        if (pubProviders.size() > 0) {
+            pw.print(prefix); pw.print("pubProviders="); pw.println(pubProviders);
+        }
+        if (conProviders.size() > 0) {
+            pw.print(prefix); pw.print("conProviders="); pw.println(conProviders);
+        }
+        if (receivers.size() > 0) {
+            pw.print(prefix); pw.print("receivers="); pw.println(receivers);
+        }
     }
     
     ProcessRecord(BatteryStatsImpl.Uid.Proc _batteryStats, IApplicationThread _thread,
@@ -154,6 +192,11 @@ class ProcessRecord implements Watchdog.PssRequestor {
         persistentActivities = 0;
     }
 
+    public void setPid(int _pid) {
+        pid = _pid;
+        stringName = null;
+    }
+    
     /**
      * This method returns true if any of the activities within the process record are interesting
      * to the user. See HistoryRecord.isInterestingToUserLocked()
@@ -188,9 +231,20 @@ class ProcessRecord implements Watchdog.PssRequestor {
     }
     
     public String toString() {
-        return "ProcessRecord{"
-            + Integer.toHexString(System.identityHashCode(this))
-            + " " + pid + ":" + processName + "/" + info.uid + "}";
+        if (stringName != null) {
+            return stringName;
+        }
+        StringBuilder sb = new StringBuilder(128);
+        sb.append("ProcessRecord{");
+        sb.append(Integer.toHexString(System.identityHashCode(this)));
+        sb.append(' ');
+        sb.append(pid);
+        sb.append(':');
+        sb.append(processName);
+        sb.append('/');
+        sb.append(info.uid);
+        sb.append('}');
+        return stringName = sb.toString();
     }
     
     /*
diff --git a/services/java/com/android/server/am/ReceiverList.java b/services/java/com/android/server/am/ReceiverList.java
index 6ac527bd7ed2..b8bf30c05268 100644
--- a/services/java/com/android/server/am/ReceiverList.java
+++ b/services/java/com/android/server/am/ReceiverList.java
@@ -39,6 +39,8 @@ class ReceiverList extends ArrayList<BroadcastFilter>
     BroadcastRecord curBroadcast = null;
     boolean linkedToDeath = false;
 
+    String stringName;
+    
     ReceiverList(ActivityManagerService _owner, ProcessRecord _app,
             int _pid, int _uid, IIntentReceiver _receiver) {
         owner = _owner;
@@ -82,11 +84,21 @@ class ReceiverList extends ArrayList<BroadcastFilter>
     }
     
     public String toString() {
-        return "ReceiverList{"
-            + Integer.toHexString(System.identityHashCode(this))
-            + " " + pid + " " + (app != null ? app.processName : "(unknown name)")
-            + "/" + uid + " client "
-            + Integer.toHexString(System.identityHashCode(receiver.asBinder()))
-            + "}";
+        if (stringName != null) {
+            return stringName;
+        }
+        StringBuilder sb = new StringBuilder(128);
+        sb.append("ReceiverList{");
+        sb.append(Integer.toHexString(System.identityHashCode(this)));
+        sb.append(' ');
+        sb.append(pid);
+        sb.append(' ');
+        sb.append((app != null ? app.processName : "(unknown name)"));
+        sb.append('/');
+        sb.append(uid);
+        sb.append(" client ");
+        sb.append(Integer.toHexString(System.identityHashCode(receiver.asBinder())));
+        sb.append('}');
+        return stringName = sb.toString();
     }
 }
diff --git a/services/java/com/android/server/am/ServiceRecord.java b/services/java/com/android/server/am/ServiceRecord.java
index 4b90600f8eed..a8fc76165c2c 100644
--- a/services/java/com/android/server/am/ServiceRecord.java
+++ b/services/java/com/android/server/am/ServiceRecord.java
@@ -77,6 +77,8 @@ class ServiceRecord extends Binder {
     long restartTime;       // time of last restart.
     long nextRestartTime;   // time when restartDelay will expire.
 
+    String stringName;      // caching of toString
+    
     void dump(PrintWriter pw, String prefix) {
         pw.println(prefix + this);
         pw.println(prefix + "intent=" + intent.getIntent());
@@ -159,8 +161,15 @@ class ServiceRecord extends Binder {
     }
     
     public String toString() {
-        return "ServiceRecord{"
-            + Integer.toHexString(System.identityHashCode(this))
-            + " " + shortName + "}";
+        if (stringName != null) {
+            return stringName;
+        }
+        StringBuilder sb = new StringBuilder(128);
+        sb.append("ServiceRecord{");
+        sb.append(Integer.toHexString(System.identityHashCode(this)));
+        sb.append(' ');
+        sb.append(shortName);
+        sb.append('}');
+        return stringName = sb.toString();
     }
 }
diff --git a/services/java/com/android/server/am/UsageStatsService.java b/services/java/com/android/server/am/UsageStatsService.java
index 3922f39f52ba..b6f91589fae6 100755
--- a/services/java/com/android/server/am/UsageStatsService.java
+++ b/services/java/com/android/server/am/UsageStatsService.java
@@ -37,11 +37,11 @@ import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collections;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.TimeZone;
 
 /**
  * This service collects the statistics associated with usage
@@ -53,6 +53,23 @@ public final class UsageStatsService extends IUsageStats.Stub {
     public static final String SERVICE_NAME = "usagestats";
     private static final boolean localLOGV = false;
     private static final String TAG = "UsageStats";
+    
+    // Current on-disk Parcel version
+    private static final int VERSION = 1004;
+
+    private static final int CHECKIN_VERSION = 3;
+    
+    private static final String FILE_PREFIX = "usage-";
+    
+    private static final int FILE_WRITE_INTERVAL = 30*60*1000; //ms
+    
+    private static final int MAX_NUM_FILES = 5;
+    
+    private static final int NUM_LAUNCH_TIME_BINS = 10;
+    private static final int[] LAUNCH_TIME_BINS = {
+        250, 500, 750, 1000, 1500, 2000, 3000, 4000, 5000
+    };
+    
     static IUsageStats sService;
     private Context mContext;
     // structure used to maintain statistics since the last checkin.
@@ -66,16 +83,48 @@ public final class UsageStatsService extends IUsageStats.Stub {
     // Order of locks is mFileLock followed by mStatsLock to avoid deadlocks
     private String mResumedPkg;
     private File mFile;
+    private String mFileLeaf;
     //private File mBackupFile;
-    private long mLastWriteRealTime;
-    private int _FILE_WRITE_INTERVAL = 30*60*1000; //ms
-    private static final String _PREFIX_DELIMIT=".";
-    private String mFilePrefix;
+    private long mLastWriteElapsedTime;
+    private File mDir;
     private Calendar mCal;
-    private static final int  _MAX_NUM_FILES = 10;
-    private long mLastTime;
+    private int mLastWriteDay;
+    
+    static class TimeStats {
+        int[] times = new int[NUM_LAUNCH_TIME_BINS];
+        
+        TimeStats() {
+        }
+        
+        void add(int val) {
+            final int[] bins = LAUNCH_TIME_BINS;
+            for (int i=0; i<NUM_LAUNCH_TIME_BINS-1; i++) {
+                if (val < bins[i]) {
+                    times[i]++;
+                    return;
+                }
+            }
+            times[NUM_LAUNCH_TIME_BINS-1]++;
+        }
+        
+        TimeStats(Parcel in) {
+            final int[] localTimes = times;
+            for (int i=0; i<NUM_LAUNCH_TIME_BINS; i++) {
+                localTimes[i] = in.readInt();
+            }
+        }
+        
+        void writeToParcel(Parcel out) {
+            final int[] localTimes = times;
+            for (int i=0; i<NUM_LAUNCH_TIME_BINS; i++) {
+                out.writeInt(localTimes[i]);
+            }
+        }
+    }
     
     private class PkgUsageStatsExtended {
+        final HashMap<String, TimeStats> mLaunchTimes
+                = new HashMap<String, TimeStats>();
         int mLaunchCount;
         long mUsageTime;
         long mPausedTime;
@@ -85,44 +134,106 @@ public final class UsageStatsService extends IUsageStats.Stub {
             mLaunchCount = 0;
             mUsageTime = 0;
         }
+        
+        PkgUsageStatsExtended(Parcel in) {
+            mLaunchCount = in.readInt();
+            mUsageTime = in.readLong();
+            if (localLOGV) Log.v(TAG, "Launch count: " + mLaunchCount
+                    + ", Usage time:" + mUsageTime);
+            
+            final int N = in.readInt();
+            if (localLOGV) Log.v(TAG, "Reading comps: " + N);
+            for (int i=0; i<N; i++) {
+                String comp = in.readString();
+                if (localLOGV) Log.v(TAG, "Component: " + comp);
+                TimeStats times = new TimeStats(in);
+                mLaunchTimes.put(comp, times);
+            }
+        }
+        
         void updateResume() {
             mLaunchCount ++;
             mResumedTime = SystemClock.elapsedRealtime();
         }
+        
         void updatePause() {
             mPausedTime =  SystemClock.elapsedRealtime();
             mUsageTime += (mPausedTime - mResumedTime);
         }
+        
+        void addLaunchTime(String comp, int millis) {
+            TimeStats times = mLaunchTimes.get(comp);
+            if (times == null) {
+                times = new TimeStats();
+                mLaunchTimes.put(comp, times);
+            }
+            times.add(millis);
+        }
+        
+        void writeToParcel(Parcel out) {
+            out.writeInt(mLaunchCount);
+            out.writeLong(mUsageTime);
+            final int N = mLaunchTimes.size();
+            out.writeInt(N);
+            if (N > 0) {
+                for (Map.Entry<String, TimeStats> ent : mLaunchTimes.entrySet()) {
+                    out.writeString(ent.getKey());
+                    TimeStats times = ent.getValue();
+                    times.writeToParcel(out);
+                }
+            }
+        }
+        
         void clear() {
+            mLaunchTimes.clear();
             mLaunchCount = 0;
             mUsageTime = 0;
         }
     }
     
-    UsageStatsService(String fileName) {
+    UsageStatsService(String dir) {
         mStats = new HashMap<String, PkgUsageStatsExtended>();
         mStatsLock = new Object();
         mFileLock = new Object();
-        mFilePrefix = fileName;
-        mCal = Calendar.getInstance();
+        mDir = new File(dir);
+        mCal = Calendar.getInstance(TimeZone.getTimeZone("GMT+0"));
+        
+        mDir.mkdir();
+        
+        // Remove any old usage files from previous versions.
+        File parentDir = mDir.getParentFile();
+        String fList[] = parentDir.list();
+        if (fList != null) {
+            String prefix = mDir.getName() + ".";
+            int i = fList.length;
+            while (i > 0) {
+                i--;
+                if (fList[i].startsWith(prefix)) {
+                    Log.i(TAG, "Deleting old usage file: " + fList[i]);
+                    (new File(parentDir, fList[i])).delete();
+                }
+            }
+        }
+        
         // Update current stats which are binned by date
-        String uFileName = getCurrentDateStr(mFilePrefix);
-        mFile = new File(uFileName);
+        mFileLeaf = getCurrentDateStr(FILE_PREFIX);
+        mFile = new File(mDir, mFileLeaf);
         readStatsFromFile();
-        mLastWriteRealTime = SystemClock.elapsedRealtime();
-        mLastTime = new Date().getTime();
+        mLastWriteElapsedTime = SystemClock.elapsedRealtime();
+        // mCal was set by getCurrentDateStr(), want to use that same time.
+        mLastWriteDay = mCal.get(Calendar.DAY_OF_YEAR);
     }
 
     /*
      * Utility method to convert date into string.
      */
     private String getCurrentDateStr(String prefix) {
-        mCal.setTime(new Date());
+        mCal.setTimeInMillis(System.currentTimeMillis());
         StringBuilder sb = new StringBuilder();
         if (prefix != null) {
             sb.append(prefix);
-            sb.append(".");
         }
+        sb.append(mCal.get(Calendar.YEAR));
         int mm = mCal.get(Calendar.MONTH) - Calendar.JANUARY +1;
         if (mm < 10) {
             sb.append("0");
@@ -133,7 +244,6 @@ public final class UsageStatsService extends IUsageStats.Stub {
             sb.append("0");
         }
         sb.append(dd);
-        sb.append(mCal.get(Calendar.YEAR));
         return sb.toString();
     }
     
@@ -166,11 +276,20 @@ public final class UsageStatsService extends IUsageStats.Stub {
     
     private void readStatsFLOCK(File file) throws IOException {
         Parcel in = getParcelForFile(file);
-        while (in.dataAvail() > 0) {
+        int vers = in.readInt();
+        if (vers != VERSION) {
+            Log.w(TAG, "Usage stats version changed; dropping");
+            return;
+        }
+        int N = in.readInt();
+        while (N > 0) {
+            N--;
             String pkgName = in.readString();
-            PkgUsageStatsExtended pus = new PkgUsageStatsExtended();
-            pus.mLaunchCount = in.readInt();
-            pus.mUsageTime = in.readLong();
+            if (pkgName == null) {
+                break;
+            }
+            if (localLOGV) Log.v(TAG, "Reading package #" + N + ": " + pkgName);
+            PkgUsageStatsExtended pus = new PkgUsageStatsExtended(in);
             synchronized (mStatsLock) {
                 mStats.put(pkgName, pus);
             }
@@ -178,27 +297,18 @@ public final class UsageStatsService extends IUsageStats.Stub {
     }
 
     private ArrayList<String> getUsageStatsFileListFLOCK() {
-        File dir = getUsageFilesDir();
-        if (dir == null) {
-            Log.w(TAG, "Couldnt find writable directory for usage stats file");
-            return null;
-        }
         // Check if there are too many files in the system and delete older files
-        String fList[] = dir.list();
+        String fList[] = mDir.list();
         if (fList == null) {
             return null;
         }
-        File pre = new File(mFilePrefix);
-        String filePrefix = pre.getName();
-        // file name followed by dot
-        int prefixLen = filePrefix.length()+1;
         ArrayList<String> fileList = new ArrayList<String>();
         for (String file : fList) {
-            int index = file.indexOf(filePrefix);
-            if (index == -1) {
+            if (!file.startsWith(FILE_PREFIX)) {
                 continue;
             }
             if (file.endsWith(".bak")) {
+                (new File(mDir, file)).delete();
                 continue;
             }
             fileList.add(file);
@@ -206,20 +316,7 @@ public final class UsageStatsService extends IUsageStats.Stub {
         return fileList;
     }
     
-    private File getUsageFilesDir() {
-        if (mFilePrefix == null) {
-            return null;
-        }
-        File pre = new File(mFilePrefix);
-        return new File(pre.getParent());
-    }
-    
     private void checkFileLimitFLOCK() {
-        File dir = getUsageFilesDir();
-        if (dir == null) {
-            Log.w(TAG, "Couldnt find writable directory for usage stats file");
-            return;
-        }
         // Get all usage stats output files
         ArrayList<String> fileList = getUsageStatsFileListFLOCK();
         if (fileList == null) {
@@ -227,49 +324,54 @@ public final class UsageStatsService extends IUsageStats.Stub {
             return;
         }
         int count = fileList.size();
-        if (count <= _MAX_NUM_FILES) {
+        if (count <= MAX_NUM_FILES) {
             return;
         }
         // Sort files
         Collections.sort(fileList);
-        count -= _MAX_NUM_FILES;
+        count -= MAX_NUM_FILES;
         // Delete older files
         for (int i = 0; i < count; i++) {
             String fileName = fileList.get(i);
-            File file = new File(dir, fileName);
-            Log.i(TAG, "Deleting file : "+fileName);
+            File file = new File(mDir, fileName);
+            Log.i(TAG, "Deleting usage file : " + fileName);
             file.delete();
         }
     }
     
-    private void writeStatsToFile() {
+    private void writeStatsToFile(boolean force) {
         synchronized (mFileLock) {
-            long currTime = new Date().getTime();
-            boolean dayChanged =  ((currTime - mLastTime) >= (24*60*60*1000));
-            long currRealTime = SystemClock.elapsedRealtime();
-            if (((currRealTime-mLastWriteRealTime) < _FILE_WRITE_INTERVAL) &&
-                    (!dayChanged)) {
-                // wait till the next update
-                return;
+            mCal.setTimeInMillis(System.currentTimeMillis());
+            final int curDay = mCal.get(Calendar.DAY_OF_YEAR);
+            // Determine if the day changed...  note that this will be wrong
+            // if the year has changed but we are in the same day of year...
+            // we can probably live with this.
+            final boolean dayChanged =  curDay != mLastWriteDay;
+            long currElapsedTime = SystemClock.elapsedRealtime();
+            if (!force) {
+                if (((currElapsedTime-mLastWriteElapsedTime) < FILE_WRITE_INTERVAL) &&
+                        (!dayChanged)) {
+                    // wait till the next update
+                    return;
+                }
             }
             // Get the most recent file
-            String todayStr = getCurrentDateStr(mFilePrefix);
+            mFileLeaf = getCurrentDateStr(FILE_PREFIX);
             // Copy current file to back up
             File backupFile =  new File(mFile.getPath() + ".bak");
             mFile.renameTo(backupFile);
             try {
-                checkFileLimitFLOCK();
-                mFile.createNewFile();
                 // Write mStats to file
                 writeStatsFLOCK();
-                mLastWriteRealTime = currRealTime;
-                mLastTime = currTime;
+                mLastWriteElapsedTime = currElapsedTime;
                 if (dayChanged) {
+                    mLastWriteDay = curDay;
                     // clear stats
                     synchronized (mStats) {
                         mStats.clear();
                     }
-                    mFile = new File(todayStr);
+                    mFile = new File(mDir, mFileLeaf);
+                    checkFileLimitFLOCK();
                 }
                 // Delete the backup file
                 if (backupFile != null) {
@@ -278,6 +380,7 @@ public final class UsageStatsService extends IUsageStats.Stub {
             } catch (IOException e) {
                 Log.w(TAG, "Failed writing stats to file:" + mFile);
                 if (backupFile != null) {
+                    mFile.delete();
                     backupFile.renameTo(mFile);
                 }
             }
@@ -286,22 +389,26 @@ public final class UsageStatsService extends IUsageStats.Stub {
 
     private void writeStatsFLOCK() throws IOException {
         FileOutputStream stream = new FileOutputStream(mFile);
-        Parcel out = Parcel.obtain();
-        writeStatsToParcelFLOCK(out);
-        stream.write(out.marshall());
-        out.recycle();
-        stream.flush();
-        stream.close();
+        try {
+            Parcel out = Parcel.obtain();
+            writeStatsToParcelFLOCK(out);
+            stream.write(out.marshall());
+            out.recycle();
+            stream.flush();
+        } finally {
+            stream.close();
+        }
     }
 
     private void writeStatsToParcelFLOCK(Parcel out) {
         synchronized (mStatsLock) {
+            out.writeInt(VERSION);
             Set<String> keys = mStats.keySet();
+            out.writeInt(keys.size());
             for (String key : keys) {
                 PkgUsageStatsExtended pus = mStats.get(key);
                 out.writeString(key);
-                out.writeInt(pus.mLaunchCount);
-                out.writeLong(pus.mUsageTime);
+                pus.writeToParcel(out);
             }
         }
     }
@@ -355,6 +462,10 @@ public final class UsageStatsService extends IUsageStats.Stub {
             return;
         }
         if (localLOGV) Log.i(TAG, "paused component:"+pkgName);
+        
+        // Persist current data to file if needed.
+        writeStatsToFile(false);
+        
         synchronized (mStatsLock) {
             PkgUsageStatsExtended pus = mStats.get(pkgName);
             if (pus == null) {
@@ -364,8 +475,25 @@ public final class UsageStatsService extends IUsageStats.Stub {
             }
             pus.updatePause();
         }
-        // Persist data to file
-        writeStatsToFile();
+    }
+    
+    public void noteLaunchTime(ComponentName componentName, int millis) {
+        enforceCallingPermission();
+        String pkgName;
+        if ((componentName == null) ||
+                ((pkgName = componentName.getPackageName()) == null)) {
+            return;
+        }
+        
+        // Persist current data to file if needed.
+        writeStatsToFile(false);
+        
+        synchronized (mStatsLock) {
+            PkgUsageStatsExtended pus = mStats.get(pkgName);
+            if (pus != null) {
+                pus.addLaunchTime(componentName.getClassName(), millis);
+            }
+        }
     }
     
     public void enforceCallingPermission() {
@@ -432,27 +560,25 @@ public final class UsageStatsService extends IUsageStats.Stub {
         }
     }
     
-    private void collectDumpInfoFLOCK(PrintWriter pw, String[] args) {
+    private void collectDumpInfoFLOCK(PrintWriter pw, boolean isCompactOutput,
+            boolean deleteAfterPrint) {
         List<String> fileList = getUsageStatsFileListFLOCK();
         if (fileList == null) {
             return;
         }
-        final boolean isCheckinRequest = scanArgs(args, "-c");
         Collections.sort(fileList);
-        File usageFile = new File(mFilePrefix);
-        String dirName = usageFile.getParent();
-        File dir = new File(dirName);
-        String filePrefix = usageFile.getName();
-        // file name followed by dot
-        int prefixLen = filePrefix.length()+1;
-        String todayStr = getCurrentDateStr(null);
         for (String file : fileList) {
-            File dFile = new File(dir, file);
-            String dateStr = file.substring(prefixLen);
+            if (deleteAfterPrint && file.equalsIgnoreCase(mFileLeaf)) {
+                // In this mode we don't print the current day's stats, since
+                // they are incomplete.
+                continue;
+            }
+            File dFile = new File(mDir, file);
+            String dateStr = file.substring(FILE_PREFIX.length());
             try {
                 Parcel in = getParcelForFile(dFile);
-                collectDumpInfoFromParcelFLOCK(in, pw, dateStr, isCheckinRequest);
-                if (isCheckinRequest && !todayStr.equalsIgnoreCase(dateStr)) {
+                collectDumpInfoFromParcelFLOCK(in, pw, dateStr, isCompactOutput);
+                if (deleteAfterPrint) {
                     // Delete old file after collecting info only for checkin requests
                     dFile.delete();
                 }
@@ -466,40 +592,101 @@ public final class UsageStatsService extends IUsageStats.Stub {
     }
     
     private void collectDumpInfoFromParcelFLOCK(Parcel in, PrintWriter pw,
-            String date, boolean isCheckinRequest) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Date:");
+            String date, boolean isCompactOutput) {
+        StringBuilder sb = new StringBuilder(512);
+        if (isCompactOutput) {
+            sb.append("D:");
+            sb.append(CHECKIN_VERSION);
+            sb.append(',');
+        } else {
+            sb.append("Date: ");
+        }
+        
         sb.append(date);
-        boolean first = true;
-        while (in.dataAvail() > 0) {
+        
+        int vers = in.readInt();
+        if (vers != VERSION) {
+            sb.append(" (old data version)");
+            pw.println(sb.toString());
+            return;
+        }
+        
+        pw.println(sb.toString());
+        int N = in.readInt();
+        
+        while (N > 0) {
+            N--;
             String pkgName = in.readString();
-            int launchCount = in.readInt();
-            long usageTime = in.readLong();
-            if (isCheckinRequest) {
-                if (!first) {
-                    sb.append(",");
-                }
+            if (pkgName == null) {
+                break;
+            }
+            sb.setLength(0);
+            PkgUsageStatsExtended pus = new PkgUsageStatsExtended(in);
+            if (isCompactOutput) {
+                sb.append("P:");
                 sb.append(pkgName);
                 sb.append(",");
-                sb.append(launchCount);
+                sb.append(pus.mLaunchCount);
                 sb.append(",");
-                sb.append(usageTime);
-                sb.append("ms");
-            } else {
-                if (first) {
-                    sb.append("\n");
+                sb.append(pus.mUsageTime);
+                sb.append('\n');
+                final int NC = pus.mLaunchTimes.size();
+                if (NC > 0) {
+                    for (Map.Entry<String, TimeStats> ent : pus.mLaunchTimes.entrySet()) {
+                        sb.append("A:");
+                        sb.append(ent.getKey());
+                        TimeStats times = ent.getValue();
+                        for (int i=0; i<NUM_LAUNCH_TIME_BINS; i++) {
+                            sb.append(",");
+                            sb.append(times.times[i]);
+                        }
+                        sb.append('\n');
+                    }
                 }
-                sb.append("pkg=");
+                
+            } else {
+                sb.append("  ");
                 sb.append(pkgName);
-                sb.append(", launchCount=");
-                sb.append(launchCount);
-                sb.append(", usageTime=");
-                sb.append(usageTime);
-                sb.append(" ms\n");
+                sb.append(": ");
+                sb.append(pus.mLaunchCount);
+                sb.append(" times, ");
+                sb.append(pus.mUsageTime);
+                sb.append(" ms");
+                sb.append('\n');
+                final int NC = pus.mLaunchTimes.size();
+                if (NC > 0) {
+                    for (Map.Entry<String, TimeStats> ent : pus.mLaunchTimes.entrySet()) {
+                        sb.append("    ");
+                        sb.append(ent.getKey());
+                        TimeStats times = ent.getValue();
+                        int lastBin = 0;
+                        boolean first = true;
+                        for (int i=0; i<NUM_LAUNCH_TIME_BINS-1; i++) {
+                            if (times.times[i] != 0) {
+                                sb.append(first ? ": " : ", ");
+                                sb.append(lastBin);
+                                sb.append('-');
+                                sb.append(LAUNCH_TIME_BINS[i]);
+                                sb.append('=');
+                                sb.append(times.times[i]);
+                                first = false;
+                            }
+                            lastBin = LAUNCH_TIME_BINS[i];
+                        }
+                        if (times.times[NUM_LAUNCH_TIME_BINS-1] != 0) {
+                            sb.append(first ? ": " : ", ");
+                            sb.append(">=");
+                            sb.append(lastBin);
+                            sb.append('=');
+                            sb.append(times.times[NUM_LAUNCH_TIME_BINS-1]);
+                        }
+                        sb.append('\n');
+                    }
+                }
             }
-            first = false;
+            
+            pw.write(sb.toString());
         }
-        pw.write(sb.toString());
     }
     
     /**
@@ -524,8 +711,19 @@ public final class UsageStatsService extends IUsageStats.Stub {
      * The data persisted to file is parsed and the stats are computed. 
      */
     protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
+        final boolean isCheckinRequest = scanArgs(args, "--checkin");
+        final boolean isCompactOutput = isCheckinRequest || scanArgs(args, "-c");
+        final boolean deleteAfterPrint = isCheckinRequest || scanArgs(args, "-d");
+        
+        // Make sure the current stats are written to the file.  This
+        // doesn't need to be done if we are deleting files after printing,
+        // since it that case we won't print the current stats.
+        if (!deleteAfterPrint) {
+            writeStatsToFile(true);
+        }
+        
         synchronized (mFileLock) {
-            collectDumpInfoFLOCK(pw, args);
+            collectDumpInfoFLOCK(pw, isCompactOutput, deleteAfterPrint);
         }
     }
 
diff --git a/telephony/java/com/android/internal/telephony/DriverCall.java b/telephony/java/com/android/internal/telephony/DriverCall.java
index 6c4e71fe99e5..0d9a60f2591f 100644
--- a/telephony/java/com/android/internal/telephony/DriverCall.java
+++ b/telephony/java/com/android/internal/telephony/DriverCall.java
@@ -44,8 +44,11 @@ public class DriverCall implements Comparable {
     public String number;
     public int TOA;
     public boolean isVoice;
+    public boolean isVoicePrivacy;
     public int als;
     public int numberPresentation;
+    public String name;
+    public int namePresentation;
 
     /** returns null on error */
     static DriverCall
@@ -101,11 +104,15 @@ public class DriverCall implements Comparable {
     public String
     toString() {
         return "id=" + index + ","
-                + (isMT ? "mt" : "mo") + ","
                 + state + ","
-                + (isVoice ? "voice" : "no_voc") + ","
+                + "toa=" + TOA + ","
                 + (isMpty ? "conf" : "norm") + ","
-                + TOA + "," + als + ",cli " + numberPresentation;
+                + (isMT ? "mt" : "mo") + ","
+                + als + ","
+                + (isVoice ? "voc" : "nonvoc") + ","
+                + (isVoicePrivacy ? "evp" : "noevp") + ","
+                /*+ "number=" + number */ + ",cli=" + numberPresentation + ","
+                /*+ "name="+ name */ + "," + namePresentation;
     }
 
     public static State
diff --git a/telephony/java/com/android/internal/telephony/Phone.java b/telephony/java/com/android/internal/telephony/Phone.java
index ed90d321a4b2..3f210ca82564 100644
--- a/telephony/java/com/android/internal/telephony/Phone.java
+++ b/telephony/java/com/android/internal/telephony/Phone.java
@@ -113,9 +113,12 @@ public interface Phone {
     static final String APN_TYPE_DEFAULT = "default";
     /** APN type for MMS traffic */
     static final String APN_TYPE_MMS = "mms";
+    /** APN type for SUPL assisted GPS */
+    static final String APN_TYPE_SUPL = "supl";
 
     // "Features" accessible through the connectivity manager
     static final String FEATURE_ENABLE_MMS = "enableMMS";
+    static final String FEATURE_ENABLE_SUPL = "enableSUPL";
 
     /**
      * Return codes for <code>enableApnType()</code>
@@ -170,7 +173,7 @@ public interface Phone {
     int NT_MODE_EVDO_NO_CDMA = 6; /* EvDo only */
     int NT_MODE_GLOBAL       = 7; /* GSM/WCDMA, CDMA, and EvDo (auto mode, according to PRL)
                                      AVAILABLE Application Settings menu*/
-    int PREFERRED_NT_MODE    = NT_MODE_GLOBAL;
+    int PREFERRED_NT_MODE    = NT_MODE_GSM_ONLY;
 
 
     // Used for CDMA roaming mode
diff --git a/telephony/java/com/android/internal/telephony/PhoneFactory.java b/telephony/java/com/android/internal/telephony/PhoneFactory.java
index 3db0499a618e..86e2f0449da4 100644
--- a/telephony/java/com/android/internal/telephony/PhoneFactory.java
+++ b/telephony/java/com/android/internal/telephony/PhoneFactory.java
@@ -108,26 +108,23 @@ public class PhoneFactory {
                 sCommandsInterface = new RIL(context, networkMode, cdmaSubscription);
 
                 switch(networkMode) {
-                    case RILConstants.NETWORK_MODE_WCDMA_PREF:
-                    case RILConstants.NETWORK_MODE_GSM_ONLY:
-                    case RILConstants.NETWORK_MODE_WCDMA_ONLY:
-                    case RILConstants.NETWORK_MODE_GSM_UMTS:
-                        sProxyPhone = new PhoneProxy(new GSMPhone(context,
-                                sCommandsInterface, sPhoneNotifier));
-                        Log.i(LOG_TAG, "Creating GSMPhone");
-                        break;
                     case RILConstants.NETWORK_MODE_CDMA:
                     case RILConstants.NETWORK_MODE_CDMA_NO_EVDO:
                     case RILConstants.NETWORK_MODE_EVDO_NO_CDMA:
+                    case RILConstants.NETWORK_MODE_GLOBAL:
                         sProxyPhone = new PhoneProxy(new CDMAPhone(context,
                                 sCommandsInterface, sPhoneNotifier));
                         Log.i(LOG_TAG, "Creating CDMAPhone");
                         break;
-                    case RILConstants.NETWORK_MODE_GLOBAL:
+                    case RILConstants.NETWORK_MODE_WCDMA_PREF:
+                    case RILConstants.NETWORK_MODE_GSM_ONLY:
+                    case RILConstants.NETWORK_MODE_WCDMA_ONLY:
+                    case RILConstants.NETWORK_MODE_GSM_UMTS:
                     default:
-                        sProxyPhone = new PhoneProxy(new CDMAPhone(context,
+                        sProxyPhone = new PhoneProxy(new GSMPhone(context,
                                 sCommandsInterface, sPhoneNotifier));
-                        Log.i(LOG_TAG, "Creating CDMAPhone");
+                        Log.i(LOG_TAG, "Creating GSMPhone");
+                        break;
                 }
                 sMadeDefaults = true;
             }
@@ -160,5 +157,3 @@ public class PhoneFactory {
         }
     }
 }
-
-
diff --git a/telephony/java/com/android/internal/telephony/RIL.java b/telephony/java/com/android/internal/telephony/RIL.java
index f5d3b32cd43a..289be6e165e3 100644
--- a/telephony/java/com/android/internal/telephony/RIL.java
+++ b/telephony/java/com/android/internal/telephony/RIL.java
@@ -565,22 +565,18 @@ public final class RIL extends BaseCommands implements CommandsInterface {
         mNetworkMode = networkMode;
         //At startup mPhoneType is first set from networkMode
         switch(networkMode) {
-            case RILConstants.NETWORK_MODE_WCDMA_PREF:
-            case RILConstants.NETWORK_MODE_GSM_ONLY:
-            case RILConstants.NETWORK_MODE_WCDMA_ONLY:
-            case RILConstants.NETWORK_MODE_GSM_UMTS:
-                mPhoneType = RILConstants.GSM_PHONE;
-                break;
             case RILConstants.NETWORK_MODE_CDMA:
             case RILConstants.NETWORK_MODE_CDMA_NO_EVDO:
             case RILConstants.NETWORK_MODE_EVDO_NO_CDMA:
-                mPhoneType = RILConstants.CDMA_PHONE;
-                break;
             case RILConstants.NETWORK_MODE_GLOBAL:
                 mPhoneType = RILConstants.CDMA_PHONE;
                 break;
+            case RILConstants.NETWORK_MODE_WCDMA_PREF:
+            case RILConstants.NETWORK_MODE_GSM_ONLY:
+            case RILConstants.NETWORK_MODE_WCDMA_ONLY:
+            case RILConstants.NETWORK_MODE_GSM_UMTS:
             default:
-                mPhoneType = RILConstants.CDMA_PHONE;
+                mPhoneType = RILConstants.GSM_PHONE;
         }
 
         PowerManager pm = (PowerManager)context.getSystemService(Context.POWER_SERVICE);
@@ -2629,8 +2625,16 @@ public final class RIL extends BaseCommands implements CommandsInterface {
             dc.als = p.readInt();
             voiceSettings = p.readInt();
             dc.isVoice = (0 == voiceSettings) ? false : true;
+
+            //dc.isVoicePrivacy = (0 != p.readInt());
+            int voicePrivacy = p.readInt();
+            dc.isVoicePrivacy = (0 != voicePrivacy);
+
             dc.number = p.readString();
-            dc.numberPresentation = DriverCall.presentationFromCLIP(p.readInt());
+            int np = p.readInt();
+            dc.numberPresentation = DriverCall.presentationFromCLIP(np);
+            dc.name = p.readString();
+            dc.namePresentation = p.readInt();
 
             // Make sure there's a leading + on addresses with a TOA
             // of 145
@@ -2668,7 +2672,7 @@ public final class RIL extends BaseCommands implements CommandsInterface {
             PDPContextState pdp = new PDPContextState();
 
             pdp.cid = p.readInt();
-            pdp.active = p.readInt() == 0 ? false : true;
+            pdp.active = p.readInt();
             pdp.type = p.readString();
             pdp.apn = p.readString();
             pdp.address = p.readString();
diff --git a/telephony/java/com/android/internal/telephony/RILConstants.java b/telephony/java/com/android/internal/telephony/RILConstants.java
index 028aad71f3b4..9c63627b62c1 100644
--- a/telephony/java/com/android/internal/telephony/RILConstants.java
+++ b/telephony/java/com/android/internal/telephony/RILConstants.java
@@ -51,7 +51,7 @@ public interface RILConstants {
     int NETWORK_MODE_EVDO_NO_CDMA   = 6; /* EvDo only */
     int NETWORK_MODE_GLOBAL         = 7; /* GSM/WCDMA, CDMA, and EvDo (auto mode, according to PRL)
                                             AVAILABLE Application Settings menu*/
-    int PREFERRED_NETWORK_MODE      = NETWORK_MODE_GLOBAL;
+    int PREFERRED_NETWORK_MODE      = NETWORK_MODE_GSM_ONLY;
 
     /* CDMA subscription source. See ril.h RIL_REQUEST_CDMA_SET_SUBSCRIPTION */
     int SUBSCRIPTION_FROM_RUIM      = 0; /* CDMA subscription from RUIM when available */
diff --git a/telephony/java/com/android/internal/telephony/ServiceStateTracker.java b/telephony/java/com/android/internal/telephony/ServiceStateTracker.java
index a4bf0dd7ce24..28a996870149 100644
--- a/telephony/java/com/android/internal/telephony/ServiceStateTracker.java
+++ b/telephony/java/com/android/internal/telephony/ServiceStateTracker.java
@@ -114,7 +114,6 @@ public abstract class ServiceStateTracker extends Handler {
 
     // Event Log Tags
     protected static final int EVENT_LOG_CGREG_FAIL = 50107;
-    protected static final int EVENT_DATA_STATE_RADIO_OFF = 50108;
 
     //***** Time Zones
     protected static final String TIMEZONE_PROPERTY = "persist.sys.timezone";
@@ -241,4 +240,3 @@ public abstract class ServiceStateTracker extends Handler {
         pollingContext = new int[1];
     }
 }
-
diff --git a/telephony/java/com/android/internal/telephony/SmsMessageBase.java b/telephony/java/com/android/internal/telephony/SmsMessageBase.java
index 7c324511b2b9..1aad38d2aa82 100644
--- a/telephony/java/com/android/internal/telephony/SmsMessageBase.java
+++ b/telephony/java/com/android/internal/telephony/SmsMessageBase.java
@@ -20,20 +20,7 @@ import android.util.Log;
 import com.android.internal.telephony.SmsHeader;
 import java.util.Arrays;
 
-import static android.telephony.SmsMessage.ENCODING_7BIT;
-import static android.telephony.SmsMessage.ENCODING_16BIT;
-import static android.telephony.SmsMessage.MAX_USER_DATA_BYTES;
-import static android.telephony.SmsMessage.MAX_USER_DATA_BYTES_WITH_HEADER;
-import static android.telephony.SmsMessage.MAX_USER_DATA_SEPTETS;
-import static android.telephony.SmsMessage.MAX_USER_DATA_SEPTETS_WITH_HEADER;
 import static android.telephony.SmsMessage.MessageClass;
-import static com.android.internal.telephony.SmsAddress.TON_ABBREVIATED;
-import static com.android.internal.telephony.SmsAddress.TON_ALPHANUMERIC;
-import static com.android.internal.telephony.SmsAddress.TON_INTERNATIONAL;
-import static com.android.internal.telephony.SmsAddress.TON_NATIONAL;
-import static com.android.internal.telephony.SmsAddress.TON_NETWORK;
-import static com.android.internal.telephony.SmsAddress.TON_SUBSCRIBER;
-import static com.android.internal.telephony.SmsAddress.TON_UNKNOWN;
 
 /**
  * Base class declaring the specific methods and members for SmsMessage.
@@ -385,4 +372,3 @@ public abstract class SmsMessageBase {
     }
 
 }
-
diff --git a/telephony/java/com/android/internal/telephony/TelephonyEventLog.java b/telephony/java/com/android/internal/telephony/TelephonyEventLog.java
index 1ef3c6cb1106..97f9d7d450cf 100644
--- a/telephony/java/com/android/internal/telephony/TelephonyEventLog.java
+++ b/telephony/java/com/android/internal/telephony/TelephonyEventLog.java
@@ -28,6 +28,6 @@ public final class TelephonyEventLog {
     public static final int EVENT_LOG_RADIO_PDP_SETUP_FAIL = 50105;
     public static final int EVENT_LOG_CALL_DROP = 50106;
     public static final int EVENT_LOG_CGREG_FAIL = 50107;
-    public static final int EVENT_DATA_STATE_RADIO_OFF = 50108;
+    public static final int EVENT_LOG_DATA_STATE_RADIO_OFF = 50108;
     public static final int EVENT_LOG_PDP_NETWORK_DROP = 50109;
 }
diff --git a/telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java b/telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java
index c139619771df..8ffb7ecc44c7 100644..100755
--- a/telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java
+++ b/telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java
@@ -475,6 +475,11 @@ public class CDMAPhone extends PhoneBase {
             // we report data connected
 
             ret = DataState.CONNECTED;
+        } else if (mSST == null) {
+            // Radio Technology Change is ongoning, dispose() and removeReferences() have
+            // already been called
+
+            ret = DataState.DISCONNECTED;
         } else if (mSST.getCurrentCdmaDataConnectionState()
                 == ServiceState.RADIO_TECHNOLOGY_UNKNOWN) {
             // If we're out of service, open TCP sockets may still work
diff --git a/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java b/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
index ed617efaa95a..e0a84abb52e0 100644
--- a/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
+++ b/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
@@ -228,6 +228,9 @@ public final class CdmaDataConnectionTracker extends DataConnectionTracker {
         Log.d(LOG_TAG, "Request to enableApnType("+type+")");
         if (TextUtils.equals(type, Phone.APN_TYPE_MMS)) {
             return Phone.APN_ALREADY_ACTIVE;
+        } else if (TextUtils.equals(type, Phone.APN_TYPE_SUPL)) {
+            Log.w(LOG_TAG, "Phone.APN_TYPE_SUPL not enabled for CDMA");
+            return Phone.APN_REQUEST_FAILED;
         } else {
             return Phone.APN_REQUEST_FAILED;
         }
@@ -822,7 +825,6 @@ public final class CdmaDataConnectionTracker extends DataConnectionTracker {
 
     private void destroyAllDataConnectionList() {
         if(dataConnectionList != null) {
-            CdmaDataConnection pdp;
             dataConnectionList.removeAll(dataConnectionList);
         }
     }
diff --git a/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java b/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
index ca40e762a9f4..d5cad1ca9cee 100644
--- a/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
+++ b/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
@@ -388,7 +388,7 @@ final class CdmaServiceStateTracker extends ServiceStateTracker {
                 EventLog.List val = new EventLog.List(
                         dcTracker.getStateInString(),
                         (dcTracker.getAnyDataEnabled() ? 1 : 0) );
-                EventLog.writeEvent(TelephonyEventLog.EVENT_DATA_STATE_RADIO_OFF, val);
+                EventLog.writeEvent(TelephonyEventLog.EVENT_LOG_DATA_STATE_RADIO_OFF, val);
             }
             dcTracker.cleanConnectionBeforeRadioOff();
             
@@ -485,13 +485,17 @@ final class CdmaServiceStateTracker extends ServiceStateTracker {
                         -1, //[3] baseStationLongitude
                          0, //[4] cssIndicator; init with 0, because it is treated as a boolean
                         -1, //[5] systemId
-                        -1  //[6] networkId
+                        -1, //[6] networkId
+                        -1, //[7] TSB-58 Roaming indicator // NEWRIL:TODO UNUSED
+                        -1, //[8] Indicates if current system is in PRL  // NEWRIL:TODO UNUSED
+                        -1, //[9] Is default roaming indicator from PRL // NEWRIL:TODO UNUSED
+                        -1, //[10] If registration state is 3 this is reason for denial // NEWRIL:TODO UNUSED
                 };
 
                 if (states.length > 0) {
                     try {
                         this.mRegistrationState = Integer.parseInt(states[0]);
-                        if (states.length == 10) {
+                        if (states.length >= 10) {
                             for(int i = 0; i < states.length - offset; i++) {
                                 if (states[i + offset] != null
                                   && states[i + offset].length() > 0) {
@@ -536,7 +540,7 @@ final class CdmaServiceStateTracker extends ServiceStateTracker {
             case EVENT_POLL_STATE_OPERATOR_CDMA:
                 String opNames[] = (String[])ar.result;
 
-                if (opNames != null && opNames.length >= 4) {
+                if (opNames != null && opNames.length >= 3) {
                     newSS.setOperatorName (opNames[0], opNames[1], opNames[2]);
                 }
                 break;
diff --git a/telephony/java/com/android/internal/telephony/cdma/RuimRecords.java b/telephony/java/com/android/internal/telephony/cdma/RuimRecords.java
index 13408cfb7b9c..b18a3f18ffa9 100644
--- a/telephony/java/com/android/internal/telephony/cdma/RuimRecords.java
+++ b/telephony/java/com/android/internal/telephony/cdma/RuimRecords.java
@@ -53,6 +53,7 @@ public final class RuimRecords extends IccRecords {
     String mdn = null;  // My mobile number
     String h_sid;
     String h_nid;
+    String min2_min1;   // 10 digit MIN value MIN2+MIN1 NEWRIL:TODO currently unused
 
     // is not initialized
 
@@ -214,6 +215,9 @@ public final class RuimRecords extends IccRecords {
                 mdn    = localTemp[0];
                 h_sid  = localTemp[1];
                 h_nid  = localTemp[2];
+                if (localTemp.length >= 3) { // NEWRIL:TODO remove when new ril always returns min2_min1
+                    min2_min1 = localTemp[3];
+                }
 
                 Log.d(LOG_TAG, "MDN: " + mdn);
 
diff --git a/telephony/java/com/android/internal/telephony/cdma/SmsMessage.java b/telephony/java/com/android/internal/telephony/cdma/SmsMessage.java
index e4b474a884dc..2f26bdcbb6a5 100644
--- a/telephony/java/com/android/internal/telephony/cdma/SmsMessage.java
+++ b/telephony/java/com/android/internal/telephony/cdma/SmsMessage.java
@@ -27,7 +27,6 @@ import com.android.internal.telephony.SmsHeader;
 import com.android.internal.telephony.SmsMessageBase;
 import com.android.internal.telephony.cdma.sms.BearerData;
 import com.android.internal.telephony.cdma.sms.CdmaSmsAddress;
-import com.android.internal.telephony.cdma.sms.SmsDataCoding;
 import com.android.internal.telephony.cdma.sms.SmsEnvelope;
 import com.android.internal.telephony.cdma.sms.UserData;
 
@@ -50,23 +49,6 @@ import static android.telephony.SmsMessage.MAX_USER_DATA_BYTES_WITH_HEADER;
 import static android.telephony.SmsMessage.MAX_USER_DATA_SEPTETS;
 import static android.telephony.SmsMessage.MAX_USER_DATA_SEPTETS_WITH_HEADER;
 import static android.telephony.SmsMessage.MessageClass;
-import static com.android.internal.telephony.cdma.sms.BearerData.ERROR_NONE;
-import static com.android.internal.telephony.cdma.sms.BearerData.ERROR_TEMPORARY;
-import static com.android.internal.telephony.cdma.sms.BearerData.ERROR_PERMANENT;
-import static com.android.internal.telephony.cdma.sms.BearerData.MESSAGE_TYPE_DELIVER;
-import static com.android.internal.telephony.cdma.sms.BearerData.MESSAGE_TYPE_SUBMIT;
-import static com.android.internal.telephony.cdma.sms.BearerData.MESSAGE_TYPE_CANCELLATION;
-import static com.android.internal.telephony.cdma.sms.BearerData.MESSAGE_TYPE_DELIVERY_ACK;
-import static com.android.internal.telephony.cdma.sms.BearerData.MESSAGE_TYPE_USER_ACK;
-import static com.android.internal.telephony.cdma.sms.BearerData.MESSAGE_TYPE_READ_ACK;
-import static com.android.internal.telephony.cdma.sms.CdmaSmsAddress.SMS_ADDRESS_MAX;
-import static com.android.internal.telephony.cdma.sms.CdmaSmsAddress.SMS_SUBADDRESS_MAX;
-import static com.android.internal.telephony.cdma.sms.SmsEnvelope.SMS_BEARER_DATA_MAX;
-import static com.android.internal.telephony.cdma.sms.UserData.UD_ENCODING_7BIT_ASCII;
-import static com.android.internal.telephony.cdma.sms.UserData.UD_ENCODING_GSM_7BIT_ALPHABET;
-import static com.android.internal.telephony.cdma.sms.UserData.UD_ENCODING_IA5;
-import static com.android.internal.telephony.cdma.sms.UserData.UD_ENCODING_OCTET;
-import static com.android.internal.telephony.cdma.sms.UserData.UD_ENCODING_UNICODE_16;
 
 /**
  * A Short Message Service message.
@@ -186,7 +168,7 @@ public class SmsMessage extends SmsMessageBase {
 
         // ignore subaddress
         p.readInt(); //p_cur->sSubAddress.subaddressType
-        p.readByte(); //p_cur->sSubAddress.odd
+        p.readInt(); //p_cur->sSubAddress.odd
         count = p.readByte(); //p_cur->sSubAddress.number_of_digits
         //p_cur->sSubAddress.digits[digitCount] :
         for (int index=0; index < count; index++) {
@@ -309,15 +291,15 @@ public class SmsMessage extends SmsMessageBase {
             int septetCount = GsmAlphabet.countGsmSeptets(message, true);
             // User Data (and length)
 
-            uData.userData = message.getBytes();
+            uData.payload = message.getBytes();
 
-            if (uData.userData.length > MAX_USER_DATA_SEPTETS) {
+            if (uData.payload.length > MAX_USER_DATA_SEPTETS) {
                 // Message too long
                 return null;
             }
 
             // desired TP-Data-Coding-Scheme
-            uData.userDataEncoding = UserData.UD_ENCODING_GSM_7BIT_ALPHABET;
+            uData.msgEncoding = UserData.ENCODING_GSM_7BIT_ALPHABET;
 
             // paddingBits not needed for UD_ENCODING_GSM_7BIT_ALPHABET
 
@@ -341,15 +323,15 @@ public class SmsMessage extends SmsMessageBase {
                 return null;
             }
 
-            uData.userData = textPart;
+            uData.payload = textPart;
 
-            if (uData.userData.length > MAX_USER_DATA_BYTES) {
+            if (uData.payload.length > MAX_USER_DATA_BYTES) {
                 // Message too long
                 return null;
             }
 
             // TP-Data-Coding-Scheme
-            uData.userDataEncoding = UserData.UD_ENCODING_UNICODE_16;
+            uData.msgEncoding = UserData.ENCODING_UNICODE_16;
 
             // sms header
             if(headerData != null) {
@@ -425,8 +407,8 @@ public class SmsMessage extends SmsMessageBase {
 
         // TP-Data-Coding-Scheme
         // No class, 8 bit data
-        uData.userDataEncoding = UserData.UD_ENCODING_OCTET;
-        uData.userData = data;
+        uData.msgEncoding = UserData.ENCODING_OCTET;
+        uData.payload = data;
 
         byte[] msgData = sms.getEnvelope(destinationAddress, statusReportRequested, uData,
                 true, true);
@@ -619,21 +601,21 @@ public class SmsMessage extends SmsMessageBase {
      * Parses a SMS message from its BearerData stream. (mobile-terminated only)
      */
     protected void parseSms() {
-        mBearerData = SmsDataCoding.decodeCdmaSms(mEnvelope.bearerData);
-        messageRef = mBearerData.messageID;
+        mBearerData = BearerData.decode(mEnvelope.bearerData);
+        messageRef = mBearerData.messageId;
 
         // TP-Message-Type-Indicator
         // (See 3GPP2 C.S0015-B, v2, 4.5.1)
         int messageType = mBearerData.messageType;
 
         switch (messageType) {
-        case MESSAGE_TYPE_USER_ACK:
-        case MESSAGE_TYPE_READ_ACK:
-        case MESSAGE_TYPE_DELIVER:
+        case BearerData.MESSAGE_TYPE_USER_ACK:
+        case BearerData.MESSAGE_TYPE_READ_ACK:
+        case BearerData.MESSAGE_TYPE_DELIVER:
             // Deliver (mobile-terminated only)
             parseSmsDeliver();
             break;
-        case MESSAGE_TYPE_DELIVERY_ACK:
+        case BearerData.MESSAGE_TYPE_DELIVERY_ACK:
             parseSmsDeliveryAck();
             break;
 
@@ -699,22 +681,22 @@ public class SmsMessage extends SmsMessageBase {
             return;
         }
 
-        encodingType = uData.userDataEncoding;
+        encodingType = uData.msgEncoding;
 
         // insert DCS-decoding here when type is supported by ril-library
 
-        userData = uData.userData;
+        userData = uData.payload;
         userDataHeader = uData.userDataHeader;
 
         switch (encodingType) {
-        case UD_ENCODING_GSM_7BIT_ALPHABET:
-        case UD_ENCODING_UNICODE_16:
+        case UserData.ENCODING_GSM_7BIT_ALPHABET:
+        case UserData.ENCODING_UNICODE_16:
             // user data was already decoded by wmsts-library
             messageBody = new String(userData);
             break;
 
         // data and unsupported encodings:
-        case UD_ENCODING_OCTET:
+        case UserData.ENCODING_OCTET:
         default:
             messageBody = null;
             break;
@@ -771,7 +753,7 @@ public class SmsMessage extends SmsMessageBase {
         if (useNewId) {
             setNextMessageId();
         }
-        mBearerData.messageID = nextMessageId;
+        mBearerData.messageId = nextMessageId;
 
         // Set the reply options (See C.S0015-B, v2.0, 4.5.11)
         if(statusReportRequested) {
@@ -795,7 +777,7 @@ public class SmsMessage extends SmsMessageBase {
         // ** encode BearerData **
         byte[] encodedBearerData = null;
         try {
-            encodedBearerData = SmsDataCoding.encodeCdmaSms(mBearerData);
+            encodedBearerData = BearerData.encode(mBearerData);
         } catch (Exception e) {
             Log.e(LOG_TAG, "doGetSubmitPdu: EncodeCdmaSMS function in JNI interface failed: "
                     + e.getMessage());
diff --git a/telephony/java/com/android/internal/telephony/cdma/sms/BearerData.java b/telephony/java/com/android/internal/telephony/cdma/sms/BearerData.java
index fec95297f76d..8e67387b476f 100644
--- a/telephony/java/com/android/internal/telephony/cdma/sms/BearerData.java
+++ b/telephony/java/com/android/internal/telephony/cdma/sms/BearerData.java
@@ -16,7 +16,52 @@
 
 package com.android.internal.telephony.cdma.sms;
 
+import android.util.Log;
+
+import com.android.internal.telephony.GsmAlphabet;
+import com.android.internal.telephony.SmsHeader;
+import com.android.internal.telephony.cdma.sms.UserData;
+
+import com.android.internal.util.HexDump;
+import com.android.internal.util.BitwiseInputStream;
+import com.android.internal.util.BitwiseOutputStream;
+
+/**
+ * XXX
+ *
+ *
+ */
 public final class BearerData{
+    private final static String LOG_TAG = "SMS";
+
+    /**
+     * Bearer Data Subparameter Indentifiers
+     * (See 3GPP2 C.S0015-B, v2.0, table 4.5-1)
+     */
+    private final static byte SUBPARAM_MESSAGE_IDENTIFIER               = 0x00;
+    private final static byte SUBPARAM_USER_DATA                        = 0x01;
+    private final static byte SUBPARAM_USER_REPONSE_CODE                = 0x02;
+    private final static byte SUBPARAM_MESSAGE_CENTER_TIME_STAMP        = 0x03;
+    //private final static byte SUBPARAM_VALIDITY_PERIOD_ABSOLUTE         = 0x04;
+    //private final static byte SUBPARAM_VALIDITY_PERIOD_RELATIVE         = 0x05;
+    //private final static byte SUBPARAM_DEFERRED_DELIVERY_TIME_ABSOLUTE  = 0x06;
+    //private final static byte SUBPARAM_DEFERRED_DELIVERY_TIME_RELATIVE  = 0x07;
+    //private final static byte SUBPARAM_PRIORITY_INDICATOR               = 0x08;
+    //private final static byte SUBPARAM_PRIVACY_INDICATOR                = 0x09;
+    private final static byte SUBPARAM_REPLY_OPTION                     = 0x0A;
+    private final static byte SUBPARAM_NUMBER_OF_MESSAGES               = 0x0B;
+    //private final static byte SUBPARAM_ALERT_ON_MESSAGE_DELIVERY        = 0x0C;
+    //private final static byte SUBPARAM_LANGUAGE_INDICATOR               = 0x0D;
+    private final static byte SUBPARAM_CALLBACK_NUMBER                  = 0x0E;
+    //private final static byte SUBPARAM_MESSAGE_DISPLAY_MODE             = 0x0F;
+    //private final static byte SUBPARAM_MULTIPLE_ENCODING_USER_DATA      = 0x10;
+    //private final static byte SUBPARAM_MESSAGE_DEPOSIT_INDEX            = 0x11;
+    //private final static byte SUBPARAM_SERVICE_CATEGORY_PROGRAM_DATA    = 0x12;
+    //private final static byte SUBPARAM_SERVICE_CATEGORY_PROGRAM_RESULTS = 0x13;
+    private final static byte SUBPARAM_MESSAGE_STATUS                   = 0x14;
+    //private final static byte SUBPARAM_TP_FAILURE_CAUSE                 = 0x15;
+    //private final static byte SUBPARAM_ENHANCED_VMN                     = 0x16;
+    //private final static byte SUBPARAM_ENHANCED_VMN_ACK                 = 0x17;
 
     // For completeness the following fields are listed, though not used yet.
     /**
@@ -94,9 +139,6 @@ public final class BearerData{
     public static final int ERROR_UNDEFINED              = 0xFF;
     public static final int STATUS_UNDEFINED             = 0xFF;
 
-    /** Bit-mask indicating used fields for SmsDataCoding */
-    public int mask;
-
     /**
      * 4-bit value indicating the message type in accordance to
      *      table 4.5.1-1
@@ -109,7 +151,7 @@ public final class BearerData{
      * (Special rules apply for WAP-messages.)
      * (See 3GPP2 C.S0015-B, v2, 4.5.1)
      */
-    public int messageID;
+    public int messageId;
 
     /**
      * 1-bit value that indicates whether a User Data Header is present.
@@ -188,5 +230,440 @@ public final class BearerData{
      */
     public int messageStatus = STATUS_UNDEFINED;
 
-}
+    private static class CodingException extends Exception {
+        public CodingException(String s) {
+            super(s);
+        }
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder builder = new StringBuilder();
+        builder.append("BearerData:\n");
+        builder.append("  messageType: " + messageType + "\n");
+        builder.append("  messageId: " + (int)messageId + "\n");
+        builder.append("  hasUserDataHeader: " + hasUserDataHeader + "\n");
+        builder.append("  timeStamp: " + timeStamp + "\n");
+        builder.append("  userAckReq: " + userAckReq + "\n");
+        builder.append("  deliveryAckReq: " + deliveryAckReq + "\n");
+        builder.append("  readAckReq: " + readAckReq + "\n");
+        builder.append("  reportReq: " + reportReq + "\n");
+        builder.append("  numberOfMessages: " + numberOfMessages + "\n");
+        builder.append("  callbackNumber: " + callbackNumber + "\n");
+        builder.append("  displayMode: " + displayMode + "\n");
+        builder.append("  errorClass: " + errorClass + "\n");
+        builder.append("  messageStatus: " + messageStatus + "\n");
+        builder.append("  userData: " + userData + "\n");
+        return builder.toString();
+    }
+
+    private static void encodeMessageId(BearerData bData, BitwiseOutputStream outStream)
+        throws BitwiseOutputStream.AccessException
+    {
+        outStream.write(8, 3);
+        outStream.write(4, bData.messageType);
+        outStream.write(8, bData.messageId >> 8);
+        outStream.write(8, bData.messageId);
+        outStream.write(1, bData.hasUserDataHeader ? 1 : 0);
+        outStream.skip(3);
+    }
+
+    private static void encodeUserData(BearerData bData, BitwiseOutputStream outStream)
+        throws BitwiseOutputStream.AccessException
+    {
+        int dataBits = (bData.userData.payload.length * 8) - bData.userData.paddingBits;
+        byte[] headerData = null;
+        if (bData.hasUserDataHeader) {
+            headerData = bData.userData.userDataHeader.toByteArray();
+            dataBits += headerData.length * 8;
+        }
+        int paramBits = dataBits + 13;
+        if ((bData.userData.msgEncoding == UserData.ENCODING_IS91_EXTENDED_PROTOCOL) ||
+            (bData.userData.msgEncoding == UserData.ENCODING_GSM_DCS)) {
+            paramBits += 8;
+        }
+        int paramBytes = (paramBits / 8) + ((paramBits % 8) > 0 ? 1 : 0);
+        int paddingBits = (paramBytes * 8) - paramBits;
+        outStream.write(8, paramBytes);
+        outStream.write(5, bData.userData.msgEncoding);
+        if ((bData.userData.msgEncoding == UserData.ENCODING_IS91_EXTENDED_PROTOCOL) ||
+            (bData.userData.msgEncoding == UserData.ENCODING_GSM_DCS)) {
+            outStream.write(8, bData.userData.msgType);
+        }
+        outStream.write(8, bData.userData.numFields);
+        if (headerData != null) outStream.writeByteArray(headerData.length * 8, headerData);
+        outStream.writeByteArray(dataBits, bData.userData.payload);
+        if (paddingBits > 0) outStream.write(paddingBits, 0);
+    }
+
+    private static void encodeReplyOption(BearerData bData, BitwiseOutputStream outStream)
+        throws BitwiseOutputStream.AccessException
+    {
+        outStream.write(8, 1);
+        outStream.write(1, bData.userAckReq     ? 1 : 0);
+        outStream.write(1, bData.deliveryAckReq ? 1 : 0);
+        outStream.write(1, bData.readAckReq     ? 1 : 0);
+        outStream.write(1, bData.reportReq      ? 1 : 0);
+        outStream.write(4, 0);
+    }
+
+    private static byte[] encodeDtmfSmsAddress(String address) {
+        int digits = address.length();
+        int dataBits = digits * 4;
+        int dataBytes = (dataBits / 8);
+        dataBytes += (dataBits % 8) > 0 ? 1 : 0;
+        byte[] rawData = new byte[dataBytes];
+        for (int i = 0; i < digits; i++) {
+            char c = address.charAt(i);
+            int val = 0;
+            if ((c >= '1') && (c <= '9')) val = c - '0';
+            else if (c == '0') val = 10;
+            else if (c == '*') val = 11;
+            else if (c == '#') val = 12;
+            else return null;
+            rawData[i / 2] |= val << (4 - ((i % 2) * 4));
+        }
+        return rawData;
+    }
+
+    private static void encodeCdmaSmsAddress(CdmaSmsAddress addr) throws CodingException {
+        if (addr.digitMode == CdmaSmsAddress.DIGIT_MODE_8BIT_CHAR) {
+            try {
+                addr.origBytes = addr.address.getBytes("US-ASCII");
+            } catch (java.io.UnsupportedEncodingException ex) {
+                throw new CodingException("invalid SMS address, cannot convert to ASCII");
+            }
+        } else {
+            addr.origBytes = encodeDtmfSmsAddress(addr.address);
+        }
+    }
+
+    private static void encodeCallbackNumber(BearerData bData, BitwiseOutputStream outStream)
+        throws BitwiseOutputStream.AccessException, CodingException
+    {
+        CdmaSmsAddress addr = bData.callbackNumber;
+        encodeCdmaSmsAddress(addr);
+        int paramBits = 9;
+        int dataBits = 0;
+        if (addr.digitMode == CdmaSmsAddress.DIGIT_MODE_8BIT_CHAR) {
+            paramBits += 7;
+            dataBits = addr.numberOfDigits * 8;
+        } else {
+            dataBits = addr.numberOfDigits * 4;
+        }
+        paramBits += dataBits;
+        int paramBytes = (paramBits / 8) + ((paramBits % 8) > 0 ? 1 : 0);
+        int paddingBits = (paramBytes * 8) - paramBits;
+        outStream.write(8, paramBytes);
+        outStream.write(1, addr.digitMode);
+        if (addr.digitMode == CdmaSmsAddress.DIGIT_MODE_8BIT_CHAR) {
+            outStream.write(3, addr.ton);
+            outStream.write(4, addr.numberPlan);
+        }
+        outStream.write(8, addr.numberOfDigits);
+        outStream.writeByteArray(dataBits, addr.origBytes);
+        if (paddingBits > 0) outStream.write(paddingBits, 0);
+    }
+
+    private static void encodeMsgStatus(BearerData bData, BitwiseOutputStream outStream)
+        throws BitwiseOutputStream.AccessException
+    {
+        outStream.write(8, 1);
+        outStream.write(2, bData.errorClass);
+        outStream.write(6, bData.messageStatus);
+    }
 
+    private static void encodeMsgCount(BearerData bData, BitwiseOutputStream outStream)
+        throws BitwiseOutputStream.AccessException
+    {
+        outStream.write(8, 1);
+        outStream.write(8, bData.numberOfMessages);
+    }
+
+    private static void encodeMsgCenterTimeStamp(BearerData bData, BitwiseOutputStream outStream)
+        throws BitwiseOutputStream.AccessException
+    {
+        outStream.write(8, 6);
+        outStream.writeByteArray(6 * 8, bData.timeStamp);
+    }
+
+    /**
+     * Create serialized representation for BearerData object.
+     * (See 3GPP2 C.R1001-F, v1.0, section 4.5 for layout details)
+     *
+     * @param bearerData an instance of BearerData.
+     *
+     * @return data byta array of raw encoded SMS bearer data.
+     */
+    public static byte[] encode(BearerData bData) {
+        try {
+            BitwiseOutputStream outStream = new BitwiseOutputStream(200);
+            outStream.write(8, SUBPARAM_MESSAGE_IDENTIFIER);
+            encodeMessageId(bData, outStream);
+            if (bData.userData != null) {
+                outStream.write(8, SUBPARAM_USER_DATA);
+                encodeUserData(bData, outStream);
+            }
+            if (bData.callbackNumber != null) {
+                outStream.write(8, SUBPARAM_CALLBACK_NUMBER);
+                encodeCallbackNumber(bData, outStream);
+            }
+            if (bData.userAckReq || bData.deliveryAckReq || bData.readAckReq || bData.reportReq) {
+                outStream.write(8, SUBPARAM_REPLY_OPTION);
+                encodeReplyOption(bData, outStream);
+            }
+            if (bData.numberOfMessages != 0) {
+                outStream.write(8, SUBPARAM_NUMBER_OF_MESSAGES);
+                encodeMsgCount(bData, outStream);
+            }
+            if (bData.timeStamp != null) {
+                outStream.write(8, SUBPARAM_MESSAGE_CENTER_TIME_STAMP);
+                encodeMsgCenterTimeStamp(bData, outStream);
+            }
+            return outStream.toByteArray();
+        } catch (BitwiseOutputStream.AccessException ex) {
+            Log.e(LOG_TAG, "BearerData encode failed: " + ex);
+        } catch (CodingException ex) {
+            Log.e(LOG_TAG, "BearerData encode failed: " + ex);
+        }
+        return null;
+   }
+
+    private static void decodeMessageId(BearerData bData, BitwiseInputStream inStream)
+        throws BitwiseInputStream.AccessException, CodingException
+    {
+        if (inStream.read(8) != 3) {
+            throw new CodingException("MESSAGE_IDENTIFIER subparam size incorrect");
+        }
+        bData.messageType = inStream.read(4);
+        bData.messageId = inStream.read(8) << 8;
+        bData.messageId |= inStream.read(8);
+        bData.hasUserDataHeader = (inStream.read(1) == 1);
+        inStream.skip(3);
+    }
+
+    private static void decodeUserData(BearerData bData, BitwiseInputStream inStream)
+        throws BitwiseInputStream.AccessException
+    {
+        byte paramBytes = inStream.read(8);
+        bData.userData = new UserData();
+        bData.userData.msgEncoding = inStream.read(5);
+        bData.userData.msgType = 0;
+        int consumedBits = 5;
+        if ((bData.userData.msgEncoding == UserData.ENCODING_IS91_EXTENDED_PROTOCOL) ||
+            (bData.userData.msgEncoding == UserData.ENCODING_GSM_DCS)) {
+            bData.userData.msgType = inStream.read(8);
+            consumedBits += 8;
+        }
+        bData.userData.numFields = inStream.read(8);
+        consumedBits += 8;
+        int dataBits = (paramBytes * 8) - consumedBits;
+        bData.userData.payload = inStream.readByteArray(dataBits);
+    }
+
+    private static String decodePayloadStr(byte[] data, int offset, int numFields, String format)
+        throws CodingException
+    {
+        try {
+            return new String(data, offset, numFields, format);
+        } catch (java.io.UnsupportedEncodingException ex) {
+            throw new CodingException("invalid ASCII user data code");
+        }
+    }
+
+    private static void decodeUserDataPayload(UserData userData, boolean hasUserDataHeader)
+        throws CodingException
+    {
+        int offset = 0;
+        if (hasUserDataHeader) {
+            int UdhLen = userData.payload[0];
+            byte[] headerData = new byte[UdhLen];
+            System.arraycopy(userData.payload, 1, headerData, 0, UdhLen);
+            userData.userDataHeader = SmsHeader.parse(headerData);
+        }
+        switch (userData.msgEncoding) {
+        case UserData.ENCODING_GSM_7BIT_ALPHABET:
+            userData.payloadStr = GsmAlphabet.gsm7BitPackedToString(userData.payload,
+                                                                    offset, userData.numFields);
+            break;
+        case UserData.ENCODING_7BIT_ASCII:
+            userData.payloadStr = decodePayloadStr(userData.payload, offset,
+                                                   userData.numFields, "US-ASCII");
+            break;
+        case UserData.ENCODING_UNICODE_16:
+            userData.payloadStr = decodePayloadStr(userData.payload, offset,
+                                                   userData.numFields * 2, "UTF-16");
+            break;
+        default:
+            throw new CodingException("unsupported user data encoding ("
+                                      + userData.msgEncoding + ")");
+        }
+    }
+
+    private static void decodeReplyOption(BearerData bData, BitwiseInputStream inStream)
+        throws BitwiseInputStream.AccessException, CodingException
+    {
+        byte paramBytes = inStream.read(8);
+        if (paramBytes != 1) {
+            throw new CodingException("REPLY_OPTION subparam size incorrect");
+        }
+        bData.userAckReq     = (inStream.read(1) == 1);
+        bData.deliveryAckReq = (inStream.read(1) == 1);
+        bData.readAckReq     = (inStream.read(1) == 1);
+        bData.reportReq      = (inStream.read(1) == 1);
+        inStream.skip(4);
+    }
+
+    private static void decodeMsgCount(BearerData bData, BitwiseInputStream inStream)
+        throws BitwiseInputStream.AccessException, CodingException
+    {
+        if (inStream.read(8) != 1) {
+            throw new CodingException("NUMBER_OF_MESSAGES subparam size incorrect");
+        }
+        bData.numberOfMessages = inStream.read(8);
+    }
+
+    private static String decodeDtmfSmsAddress(byte[] rawData, int numFields)
+        throws CodingException
+    {
+        /* DTMF 4-bit digit encoding, defined in at
+         * 3GPP2 C.S005-D, v2.0, table 2.7.1.3.2.4-4 */
+        StringBuffer strBuf = new StringBuffer(numFields);
+        for (int i = 0; i < numFields; i++) {
+            int val = 0x0F & (rawData[i / 2] >>> (4 - ((i % 2) * 4)));
+            if ((val >= 1) && (val <= 9)) strBuf.append(Integer.toString(val, 10));
+            else if (val == 10) strBuf.append('0');
+            else if (val == 11) strBuf.append('*');
+            else if (val == 12) strBuf.append('#');
+            else throw new CodingException("invalid SMS address DTMF code (" + val + ")");
+        }
+        return strBuf.toString();
+    }
+
+    private static void decodeSmsAddress(CdmaSmsAddress addr) throws CodingException {
+        if (addr.digitMode == CdmaSmsAddress.DIGIT_MODE_8BIT_CHAR) {
+            try {
+                /* As specified in 3GPP2 C.S0015-B, v2, 4.5.15 -- actually
+                 * just 7-bit ASCII encoding, with the MSB being zero. */
+                addr.address = new String(addr.origBytes, 0, addr.origBytes.length, "US-ASCII");
+            } catch (java.io.UnsupportedEncodingException ex) {
+                throw new CodingException("invalid SMS address ASCII code");
+            }
+        } else {
+            addr.address = decodeDtmfSmsAddress(addr.origBytes, addr.numberOfDigits);
+        }
+    }
+
+    private static void decodeCallbackNumber(BearerData bData, BitwiseInputStream inStream)
+        throws BitwiseInputStream.AccessException, CodingException
+    {
+        byte paramBytes = inStream.read(8);
+        CdmaSmsAddress addr = new CdmaSmsAddress();
+        addr.digitMode = inStream.read(1);
+        byte fieldBits = 4;
+        byte consumedBits = 1;
+        if (addr.digitMode == CdmaSmsAddress.DIGIT_MODE_8BIT_CHAR) {
+            addr.ton = inStream.read(3);
+            addr.numberPlan = inStream.read(4);
+            fieldBits = 8;
+            consumedBits += 7;
+        }
+        addr.numberOfDigits = inStream.read(8);
+        consumedBits += 8;
+        int remainingBits = (paramBytes * 8) - consumedBits;
+        int dataBits = addr.numberOfDigits * fieldBits;
+        int paddingBits = remainingBits - dataBits;
+        if (remainingBits < dataBits) {
+            throw new CodingException("CALLBACK_NUMBER subparam encoding size error (" +
+                                      "remainingBits " + remainingBits + ", dataBits " +
+                                      dataBits + ", paddingBits " + paddingBits + ")");
+        }
+        addr.origBytes = inStream.readByteArray(dataBits);
+        inStream.skip(paddingBits);
+        decodeSmsAddress(addr);
+        bData.callbackNumber = addr;
+    }
+
+    private static void decodeMsgStatus(BearerData bData, BitwiseInputStream inStream)
+        throws BitwiseInputStream.AccessException, CodingException
+    {
+        if (inStream.read(8) != 1) {
+            throw new CodingException("MESSAGE_STATUS subparam size incorrect");
+        }
+        bData.errorClass = inStream.read(2);
+        bData.messageStatus = inStream.read(6);
+    }
+
+    private static void decodeMsgCenterTimeStamp(BearerData bData,
+                                                 BitwiseInputStream inStream)
+        throws BitwiseInputStream.AccessException, CodingException
+    {
+        if (inStream.read(8) != 6) {
+            throw new CodingException("MESSAGE_CENTER_TIME_STAMP subparam size incorrect");
+        }
+        bData.timeStamp = inStream.readByteArray(6 * 8);
+    }
+
+    /**
+     * Create BearerData object from serialized representation.
+     * (See 3GPP2 C.R1001-F, v1.0, section 4.5 for layout details)
+     *
+     * @param smsData byte array of raw encoded SMS bearer data.
+     *
+     * @return an instance of BearerData.
+     */
+    public static BearerData decode(byte[] smsData) {
+        try {
+            BitwiseInputStream inStream = new BitwiseInputStream(smsData);
+            BearerData bData = new BearerData();
+            int foundSubparamMask = 0;
+            while (inStream.available() > 0) {
+                int subparamId = inStream.read(8);
+                int subparamIdBit = 1 << subparamId;
+                if ((foundSubparamMask & subparamIdBit) != 0) {
+                    throw new CodingException("illegal duplicate subparameter (" +
+                                              subparamId + ")");
+                }
+                foundSubparamMask |= subparamIdBit;
+                switch (subparamId) {
+                case SUBPARAM_MESSAGE_IDENTIFIER:
+                    decodeMessageId(bData, inStream);
+                    break;
+                case SUBPARAM_USER_DATA:
+                    decodeUserData(bData, inStream);
+                    break;
+                case SUBPARAM_REPLY_OPTION:
+                    decodeReplyOption(bData, inStream);
+                    break;
+                case SUBPARAM_NUMBER_OF_MESSAGES:
+                    decodeMsgCount(bData, inStream);
+                    break;
+                case SUBPARAM_CALLBACK_NUMBER:
+                    decodeCallbackNumber(bData, inStream);
+                    break;
+                case SUBPARAM_MESSAGE_STATUS:
+                    decodeMsgStatus(bData, inStream);
+                    break;
+                case SUBPARAM_MESSAGE_CENTER_TIME_STAMP:
+                    decodeMsgCenterTimeStamp(bData, inStream);
+                    break;
+                default:
+                    throw new CodingException("unsupported bearer data subparameter ("
+                                              + subparamId + ")");
+                }
+            }
+            if ((foundSubparamMask & (1 << SUBPARAM_MESSAGE_IDENTIFIER)) == 0) {
+                throw new CodingException("missing MESSAGE_IDENTIFIER subparam");
+            }
+            if (bData.userData != null) {
+                decodeUserDataPayload(bData.userData, bData.hasUserDataHeader);
+            }
+            return bData;
+        } catch (BitwiseInputStream.AccessException ex) {
+            Log.e(LOG_TAG, "BearerData decode failed: " + ex);
+        } catch (CodingException ex) {
+            Log.e(LOG_TAG, "BearerData decode failed: " + ex);
+        }
+        return null;
+    }
+}
diff --git a/telephony/java/com/android/internal/telephony/cdma/sms/CdmaSmsAddress.java b/telephony/java/com/android/internal/telephony/cdma/sms/CdmaSmsAddress.java
index 1643cab46b01..440debbd354e 100644
--- a/telephony/java/com/android/internal/telephony/cdma/sms/CdmaSmsAddress.java
+++ b/telephony/java/com/android/internal/telephony/cdma/sms/CdmaSmsAddress.java
@@ -17,6 +17,7 @@
 package com.android.internal.telephony.cdma.sms;
 
 import com.android.internal.telephony.SmsAddress;
+import com.android.internal.util.HexDump;
 
 public class CdmaSmsAddress extends SmsAddress {
     /**
@@ -95,4 +96,18 @@ public class CdmaSmsAddress extends SmsAddress {
     public CdmaSmsAddress(){
     }
 
+    @Override
+    public String toString() {
+        StringBuilder builder = new StringBuilder();
+        builder.append("CdmaSmsAddress:\n");
+        builder.append("  digitMode: " + digitMode + "\n");
+        builder.append("  numberMode: " + numberMode + "\n");
+        builder.append("  numberPlan: " + numberPlan + "\n");
+        builder.append("  numberOfDigits: " + numberOfDigits + "\n");
+        builder.append("  ton: " + ton + "\n");
+        builder.append("  address: " + address + "\n");
+        builder.append("  origBytes: " + HexDump.toHexString(origBytes) + "\n");
+        return builder.toString();
+    }
+
 }
diff --git a/telephony/java/com/android/internal/telephony/cdma/sms/SmsDataCoding.java b/telephony/java/com/android/internal/telephony/cdma/sms/SmsDataCoding.java
deleted file mode 100644
index 6ba7463a3047..000000000000
--- a/telephony/java/com/android/internal/telephony/cdma/sms/SmsDataCoding.java
+++ /dev/null
@@ -1,371 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.internal.telephony.cdma.sms;
-
-import com.android.internal.telephony.SmsHeader;
-
-/*
- * The SMSDataCoding class encodes and decodes CDMA SMS messages.
- */
-public class SmsDataCoding {
-    private final static String TAG = "CDMA_SMS_JNI";
-
-    private final static int CDMA_SMS_WMS_MASK_BD_NULL             =   0x00000000;
-    private final static int CDMA_SMS_WMS_MASK_BD_MSG_ID           =   0x00000001;
-    private final static int CDMA_SMS_WMS_MASK_BD_USER_DATA        =   0x00000002;
-//    private final static int CDMA_SMS_WMS_MASK_BD_USER_RESP        =   0x00000004;
-    private final static int CDMA_SMS_WMS_MASK_BD_MC_TIME          =   0x00000008;
-//    private final static int CDMA_SMS_WMS_MASK_BD_VALID_ABS        =   0x00000010;
-//    private final static int CDMA_SMS_WMS_MASK_BD_VALID_REL        =   0x00000020;
-//    private final static int CDMA_SMS_WMS_MASK_BD_DEFER_ABS        =   0x00000040;
-//    private final static int CDMA_SMS_WMS_MASK_BD_DEFER_REL        =   0x00000080;
-//    private final static int CDMA_SMS_WMS_MASK_BD_PRIORITY         =   0x00000100;
-//    private final static int CDMA_SMS_WMS_MASK_BD_PRIVACY          =   0x00000200;
-//    private final static int CDMA_SMS_WMS_MASK_BD_REPLY_OPTION     =   0x00000400;
-    private final static int CDMA_SMS_WMS_MASK_BD_NUM_OF_MSGS      =   0x00000800;
-//    private final static int CDMA_SMS_WMS_MASK_BD_ALERT            =   0x00001000;
-//    private final static int CDMA_SMS_WMS_MASK_BD_LANGUAGE         =   0x00002000;
-    private final static int CDMA_SMS_WMS_MASK_BD_CALLBACK         =   0x00004000;
-    private final static int CDMA_SMS_WMS_MASK_BD_DISPLAY_MODE     =   0x00008000;
-//    private final static int CDMA_SMS_WMS_MASK_BD_SCPT_DATA        =   0x00010000;
-//    private final static int CDMA_SMS_WMS_MASK_BD_SCPT_RESULT      =   0x00020000;
-//    private final static int CDMA_SMS_WMS_MASK_BD_DEPOSIT_INDEX    =   0x00040000;
-//    private final static int CDMA_SMS_WMS_MASK_BD_DELIVERY_STATUS  =   0x00080000;
-//    private final static int CDMA_SMS_WMS_MASK_BD_IP_ADDRESS       =   0x10000000;
-//    private final static int CDMA_SMS_WMS_MASK_BD_RSN_NO_NOTIFY    =   0x20000000;
-//    private final static int CDMA_SMS_WMS_MASK_BD_OTHER            =   0x40000000;
-
-    /**
-     * Successful operation.
-     */
-    private static final int JNI_CDMA_SMS_SUCCESS = 0;
-
-    /**
-     * General failure.
-     */
-    private static final int JNI_CDMA_SMS_FAILURE = 1;
-
-    /**
-     * Data length is out of length.
-     */
-    private static final int JNI_CDMA_SMS_DATA_LEN_OUT_OF_RANGE = 2;
-
-    /**
-     * Class name unknown.
-     */
-    private static final int JNI_CDMA_SMS_CLASS_UNKNOWN = 3;
-
-    /**
-     * Field ID unknown.
-     */
-    private static final int JNI_CDMA_SMS_FIELD_ID_UNKNOWN = 4;
-
-    /**
-     * Memory allocation failed.
-     */
-    private static final int JNI_CDMA_SMS_OUT_OF_MEMORY = 5;
-
-    /**
-     * Encode SMS.
-     *
-     * @param bearerData    an instance of BearerData.
-     *
-     * @return the encoded SMS as byte[].
-     */
-    public static byte[] encodeCdmaSms(BearerData bearerData) {
-        byte[] encodedSms;
-
-        if( nativeCdmaSmsConstructClientBD() == JNI_CDMA_SMS_FAILURE){
-            return null;
-        }
-
-        // check bearer data and generate bit mask
-        generateBearerDataBitMask(bearerData);
-        encodedSms = startEncoding(bearerData);
-
-        if( nativeCdmaSmsDestructClientBD() == JNI_CDMA_SMS_FAILURE){
-            return null;
-        }
-        return encodedSms;
-    }
-
-    /**
-     * Decode SMS.
-     *
-     * @param SmsData    the encoded SMS.
-     *
-     * @return an instance of BearerData.
-     */
-    public static BearerData decodeCdmaSms(byte[] SmsData) {
-        BearerData bearerData;
-
-        if( nativeCdmaSmsConstructClientBD() == JNI_CDMA_SMS_FAILURE){
-            return null;
-        }
-
-        bearerData = startDecoding(SmsData);
-
-        if( nativeCdmaSmsDestructClientBD() == JNI_CDMA_SMS_FAILURE){
-            return null;
-        }
-        return bearerData;
-    }
-
-    private static void generateBearerDataBitMask(BearerData bearerData) {
-        // initial
-        bearerData.mask = CDMA_SMS_WMS_MASK_BD_NULL;
-
-        // check message type
-        if (bearerData.messageType != 0){
-            bearerData.mask |= CDMA_SMS_WMS_MASK_BD_MSG_ID;
-        }
-
-        // check mUserData
-        if (bearerData.userData != null){
-            bearerData.mask |= CDMA_SMS_WMS_MASK_BD_USER_DATA;
-        }
-
-        // check mTimeStamp
-        if (bearerData.timeStamp != null){
-            bearerData.mask |= CDMA_SMS_WMS_MASK_BD_MC_TIME;
-        }
-
-        // check mNumberOfMessages
-        if (bearerData.numberOfMessages > 0){
-            bearerData.mask |= CDMA_SMS_WMS_MASK_BD_NUM_OF_MSGS;
-        }
-
-        // check mCallbackNumber
-        if(bearerData.callbackNumber != null){
-            bearerData.mask |= CDMA_SMS_WMS_MASK_BD_CALLBACK;
-        }
-
-        // check DisplayMode
-        if(bearerData.displayMode == BearerData.DISPLAY_DEFAULT   ||
-           bearerData.displayMode == BearerData.DISPLAY_IMMEDIATE ||
-           bearerData.displayMode == BearerData.DISPLAY_USER){
-            bearerData.mask |= CDMA_SMS_WMS_MASK_BD_DISPLAY_MODE;
-        }
-    }
-
-    private static byte[] startEncoding(BearerData bearerData) {
-        int m_id;
-        byte[] m_data;
-        int dataLength;
-        byte[] encodedSms;
-        int nbrOfHeaders = 0;
-
-        if( nativeCdmaSmsSetBearerDataPrimitives(bearerData) == JNI_CDMA_SMS_FAILURE){
-            return null;
-        }
-
-        if ((bearerData.mask & CDMA_SMS_WMS_MASK_BD_USER_DATA) == CDMA_SMS_WMS_MASK_BD_USER_DATA){
-            if( nativeCdmaSmsSetUserData(bearerData.userData) == JNI_CDMA_SMS_FAILURE){
-                return null;
-            }
-
-            if (bearerData.userData.userDataHeader != null){
-                nbrOfHeaders = bearerData.userData.userDataHeader.nbrOfHeaders;
-            }
-
-            for (int i = 0; i < nbrOfHeaders; i++) {
-                m_id = bearerData.userData.userDataHeader.getElements().get(i).getID();
-                m_data = bearerData.userData.userDataHeader.getElements().get(i).getData();
-                dataLength = m_data.length;
-                if( nativeCdmaSmsSetUserDataHeader(m_id, m_data, dataLength, i)
-                        == JNI_CDMA_SMS_FAILURE){
-                    return null;
-                }
-            }
-        }
-
-        if ((bearerData.mask & CDMA_SMS_WMS_MASK_BD_CALLBACK) == CDMA_SMS_WMS_MASK_BD_CALLBACK) {
-            if( nativeCdmaSmsSetSmsAddress(bearerData.callbackNumber) == JNI_CDMA_SMS_FAILURE){
-                return null;
-            }
-        }
-
-        /* call native method to encode SMS */
-        encodedSms = nativeCdmaSmsEncodeSms();
-
-        return encodedSms;
-    }
-
-    private static BearerData startDecoding(byte[] SmsData) {
-        BearerData bData = new BearerData();
-        byte[] udhData;
-
-        /* call native method to decode SMS */
-        if( nativeCdmaSmsDecodeSms(SmsData) == JNI_CDMA_SMS_FAILURE){
-            return null;
-        }
-
-        if( nativeCdmaSmsGetBearerDataPrimitives(bData) == JNI_CDMA_SMS_FAILURE){
-            return null;
-        }
-
-        if ((bData.mask & CDMA_SMS_WMS_MASK_BD_USER_DATA) == CDMA_SMS_WMS_MASK_BD_USER_DATA) {
-            bData.userData = new UserData();
-            if( nativeCdmaSmsGetUserData(bData.userData) == JNI_CDMA_SMS_FAILURE){
-                return null;
-            }
-
-            udhData = nativeCdmaSmsGetUserDataHeader();
-            if (udhData != null) {
-                bData.userData.userDataHeader = SmsHeader.parse(udhData);
-            }
-        }
-
-        if ((bData.mask & CDMA_SMS_WMS_MASK_BD_CALLBACK) == CDMA_SMS_WMS_MASK_BD_CALLBACK) {
-            bData.callbackNumber = new CdmaSmsAddress();
-            if( nativeCdmaSmsGetSmsAddress(bData.callbackNumber) == JNI_CDMA_SMS_FAILURE){
-                return null;
-            }
-        }
-
-        return bData;
-    }
-
-    // native methods
-
-    /**
-     * native method: Allocate memory for clientBD structure
-     *
-     * @return #JNI_CDMA_SMS_SUCCESS if succeed.
-     *         #JNI_CDMA_SMS_FAILURE if fail.
-     */
-    private static native int nativeCdmaSmsConstructClientBD();
-
-    /**
-     * native method: Free memory used for clientBD structure
-     *
-     * @return #JNI_CDMA_SMS_SUCCESS if succeed.
-     *         #JNI_CDMA_SMS_FAILURE if fail.
-     */
-    private static native int nativeCdmaSmsDestructClientBD();
-
-    /**
-     * native method: fill clientBD structure with bearerData primitives
-     *
-     * @param bearerData    an instance of BearerData.
-     *
-     * @return #JNI_CDMA_SMS_SUCCESS if succeed.
-     *         #JNI_CDMA_SMS_FAILURE if fail.
-     */
-    private static native int nativeCdmaSmsSetBearerDataPrimitives(BearerData bearerData);
-
-    /**
-     * native method: fill bearerData primitives with clientBD variables
-     *
-     * @param bearerData    an instance of BearerData.
-     *
-     * @return #JNI_CDMA_SMS_SUCCESS if succeed.
-     *         #JNI_CDMA_SMS_FAILURE if fail.
-     */
-    private static native int nativeCdmaSmsGetBearerDataPrimitives(BearerData bearerData);
-
-    /**
-     * native method: fill clientBD.user_data with UserData primitives
-     *
-     * @param userData    an instance of UserData.
-     *
-     * @return #JNI_CDMA_SMS_SUCCESS if succeed.
-     *         #JNI_CDMA_SMS_FAILURE if fail.
-     */
-    private static native int nativeCdmaSmsSetUserData(UserData userData);
-
-    /**
-     * native method: fill UserData primitives with clientBD.user_data
-     *
-     * @param userData    an instance of UserData.
-     *
-     * @return #JNI_CDMA_SMS_SUCCESS if succeed.
-     *         #JNI_CDMA_SMS_FAILURE if fail.
-     */
-    private static native int nativeCdmaSmsGetUserData(UserData userData);
-
-    /**
-     * native method: fill clientBD.user_data.headers with UserDataHeader primitives
-     *
-     * @param ID         ID of element.
-     * @param data       element data.
-     * @param dataLength data length
-     * @param index      index of element
-     *
-     * @return #JNI_CDMA_SMS_SUCCESS if succeed.
-     *         #JNI_CDMA_SMS_FAILURE if fail.
-     */
-    private static native int nativeCdmaSmsSetUserDataHeader(
-            int ID, byte[] data, int dataLength, int index);
-
-    /**
-     * native method: fill UserDataHeader primitives with clientBD.user_data.headers
-     *
-     * @return   user data headers
-     */
-    private static native byte[] nativeCdmaSmsGetUserDataHeader();
-
-    /**
-     * native method: fill clientBD.callback with SmsAddress primitives
-     *
-     * @param smsAddr    an instance of SmsAddress.
-     *
-     * @return #JNI_CDMA_SMS_SUCCESS if succeed.
-     *         #JNI_CDMA_SMS_FAILURE if fail.
-     */
-    private static native int nativeCdmaSmsSetSmsAddress(CdmaSmsAddress smsAddr);
-
-    /**
-     * native method: fill SmsAddress primitives with clientBD.callback
-     *
-     * @param smsAddr    an instance of SmsAddress.
-     *
-     * @return #JNI_CDMA_SMS_SUCCESS if succeed.
-     *         #JNI_CDMA_SMS_FAILURE if fail.
-     */
-    private static native int nativeCdmaSmsGetSmsAddress(CdmaSmsAddress smsAddr);
-
-    /**
-     * native method: call encoding functions and get encoded SMS
-     *
-     * @return   the encoded SMS
-     */
-    private static native byte[] nativeCdmaSmsEncodeSms();
-
-    /**
-     * native method: call decode functions
-     *
-     * @param encodedSMS    encoded SMS.
-     *
-     * @return #JNI_CDMA_SMS_SUCCESS if succeed.
-     *         #JNI_CDMA_SMS_FAILURE if fail.
-     */
-    private static native int nativeCdmaSmsDecodeSms(byte[] encodedSMS);
-
-    /**
-     * Load the shared library to link the native methods.
-     */
-    static {
-        try {
-            System.loadLibrary("cdma_sms_jni");
-        }
-        catch (UnsatisfiedLinkError ule) {
-            System.err.println("WARNING: Could not load cdma_sms_jni.so");
-        }
-    }
-}
-
diff --git a/telephony/java/com/android/internal/telephony/cdma/sms/UserData.java b/telephony/java/com/android/internal/telephony/cdma/sms/UserData.java
index e7614694eae7..bd6fbb48448d 100644
--- a/telephony/java/com/android/internal/telephony/cdma/sms/UserData.java
+++ b/telephony/java/com/android/internal/telephony/cdma/sms/UserData.java
@@ -17,24 +17,25 @@
 package com.android.internal.telephony.cdma.sms;
 
 import com.android.internal.telephony.SmsHeader;
+import com.android.internal.util.HexDump;
 
 public class UserData{
 
     /**
-     * Supported user data encoding types
+     * User data encoding types
      * (See 3GPP2 C.R1001-F, v1.0, table 9.1-1)
      */
-    public static final int UD_ENCODING_OCTET                      = 0x00;
-    //public static final int UD_ENCODING_EXTENDED_PROTOCOL          = 0x01;
-    public static final int UD_ENCODING_7BIT_ASCII                 = 0x02;
-    public static final int UD_ENCODING_IA5                        = 0x03;
-    public static final int UD_ENCODING_UNICODE_16                 = 0x04;
-    //public static final int UD_ENCODING_SHIFT_JIS                  = 0x05;
-    //public static final int UD_ENCODING_KOREAN                     = 0x06;
-    //public static final int UD_ENCODING_LATIN_HEBREW               = 0x07;
-    //public static final int UD_ENCODING_LATIN                      = 0x08;
-    public static final int UD_ENCODING_GSM_7BIT_ALPHABET          = 0x09;
-    //public static final int UD_ENCODING_GSM_DCS                    = 0x0A;
+    public static final int ENCODING_OCTET                      = 0x00;
+    public static final int ENCODING_IS91_EXTENDED_PROTOCOL     = 0x01;
+    public static final int ENCODING_7BIT_ASCII                 = 0x02;
+    //public static final int ENCODING_IA5                        = 0x03;
+    public static final int ENCODING_UNICODE_16                 = 0x04;
+    //public static final int ENCODING_SHIFT_JIS                  = 0x05;
+    //public static final int ENCODING_KOREAN                     = 0x06;
+    //public static final int ENCODING_LATIN_HEBREW               = 0x07;
+    //public static final int ENCODING_LATIN                      = 0x08;
+    public static final int ENCODING_GSM_7BIT_ALPHABET          = 0x09;
+    public static final int ENCODING_GSM_DCS                    = 0x0A;
 
     /**
      * Contains the data header of the user data
@@ -44,20 +45,37 @@ public class UserData{
     /**
      * Contains the data encoding type for the SMS message
      */
-    public int userDataEncoding;
+    public int msgEncoding;
 
-    // needed when encoding is IS91 or DCS (not supported yet):
-    //public int messageType;
+    // XXX needed when encoding is IS91 or DCS (not supported yet):
+    public int msgType;
 
     /**
      * Number of invalid bits in the last byte of data.
      */
     public int paddingBits;
 
+    public int numFields;
+
     /**
      * Contains the user data of a SMS message
      * (See 3GPP2 C.S0015-B, v2, 4.5.2)
      */
-    public byte[] userData;
+    public byte[] payload;
+    public String payloadStr;
+
+    @Override
+    public String toString() {
+        StringBuilder builder = new StringBuilder();
+        builder.append("UserData:\n");
+        builder.append("  msgEncoding: " + msgEncoding + "\n");
+        builder.append("  msgType: " + msgType + "\n");
+        builder.append("  paddingBits: " + paddingBits + "\n");
+        builder.append("  numFields: " + (int)numFields + "\n");
+        builder.append("  userDataHeader: " + userDataHeader + "\n");
+        builder.append("  payload: " + HexDump.toHexString(payload));
+        builder.append("  payloadStr: " + payloadStr);
+        return builder.toString();
+    }
 
 }
diff --git a/telephony/java/com/android/internal/telephony/gsm/GSMPhone.java b/telephony/java/com/android/internal/telephony/gsm/GSMPhone.java
index d1ae997239ec..a2d3c5e38047 100644..100755
--- a/telephony/java/com/android/internal/telephony/gsm/GSMPhone.java
+++ b/telephony/java/com/android/internal/telephony/gsm/GSMPhone.java
@@ -316,6 +316,11 @@ public class GSMPhone extends PhoneBase {
             // we report data connected
 
             ret = DataState.CONNECTED;
+        } else if (mSST == null) {
+            // Radio Technology Change is ongoning, dispose() and removeReferences() have
+            // already been called
+
+            ret = DataState.DISCONNECTED;
         } else if (mSST.getCurrentGprsState()
                 != ServiceState.STATE_IN_SERVICE) {
             // If we're out of service, open TCP sockets may still work
diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
index e2da7cb71cc1..71ffe74374a1 100644
--- a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
+++ b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
@@ -131,7 +131,8 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
 
     private static int APN_DEFAULT_ID = 0;
     private static int APN_MMS_ID = 1;
-    private static int APN_NUM_TYPES = 2;
+    private static int APN_SUPL_ID = 2;
+    private static int APN_NUM_TYPES = 3;
 
     private boolean[] dataEnabled = new boolean[APN_NUM_TYPES];
 
@@ -153,13 +154,6 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
     private static final String INTENT_RECONNECT_ALARM = "com.android.internal.telephony.gprs-reconnect";
     private static final String INTENT_RECONNECT_ALARM_EXTRA_REASON = "reason";
 
-    //***** Tag IDs for EventLog
-    private static final int EVENT_LOG_RADIO_RESET_COUNTDOWN_TRIGGERED = 50101;
-    private static final int EVENT_LOG_RADIO_RESET = 50102;
-    private static final int EVENT_LOG_PDP_RESET = 50103;
-    private static final int EVENT_LOG_REREGISTER_NETWORK = 50104;
-    private static final int EVENT_LOG_RADIO_PDP_SETUP_FAIL = 50105;
-
     static final Uri PREFERAPN_URI = Uri.parse("content://telephony/carriers/preferapn");
     static final String APN_ID = "apn_id";
     private boolean canSetPreferApn = false;
@@ -322,8 +316,8 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
 
     /**
      * Ensure that we are connected to an APN of the specified type.
-     * @param type the APN type (currently the only valid value
-     * is {@link Phone#APN_TYPE_MMS})
+     * @param type the APN type (currently the only valid values
+     * are {@link Phone#APN_TYPE_MMS} and {@link Phone#APN_TYPE_SUPL})
      * @return the result of the operation. Success is indicated by
      * a return value of either {@code Phone.APN_ALREADY_ACTIVE} or
      * {@code Phone.APN_REQUEST_STARTED}. In the latter case, a broadcast
@@ -331,9 +325,11 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
      * the APN has been established.
      */
     protected int enableApnType(String type) {
-        if (!TextUtils.equals(type, Phone.APN_TYPE_MMS)) {
+        if (!TextUtils.equals(type, Phone.APN_TYPE_MMS) &&
+                !TextUtils.equals(type, Phone.APN_TYPE_SUPL)) {
             return Phone.APN_REQUEST_FAILED;
         }
+
         // If already active, return
         Log.d(LOG_TAG, "enableApnType("+type+")");
         if (isApnTypeActive(type)) {
@@ -366,12 +362,15 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
      * The APN of the specified type is no longer needed. Ensure that if
      * use of the default APN has not been explicitly disabled, we are connected
      * to the default APN.
-     * @param type the APN type. The only valid value currently is {@link Phone#APN_TYPE_MMS}.
+     * @param type the APN type. The only valid values are currently 
+     * {@link Phone#APN_TYPE_MMS} and {@link Phone#APN_TYPE_SUPL}.
      * @return
      */
     protected int disableApnType(String type) {
         Log.d(LOG_TAG, "disableApnType("+type+")");
-        if (TextUtils.equals(type, Phone.APN_TYPE_MMS)) {
+        if ((TextUtils.equals(type, Phone.APN_TYPE_MMS) ||
+                TextUtils.equals(type, Phone.APN_TYPE_SUPL))
+                && isEnabled(type)) {
             removeMessages(EVENT_RESTORE_DEFAULT_APN);
             setEnabled(type, false);
             if (isApnTypeActive(Phone.APN_TYPE_DEFAULT)) {
@@ -439,6 +438,8 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
             return dataEnabled[APN_DEFAULT_ID];
         } else if (TextUtils.equals(apnType, Phone.APN_TYPE_MMS)) {
             return dataEnabled[APN_MMS_ID];
+        } else if (TextUtils.equals(apnType, Phone.APN_TYPE_SUPL)) {
+            return dataEnabled[APN_SUPL_ID];
         } else {
             return false;
         }
@@ -450,9 +451,12 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
             dataEnabled[APN_DEFAULT_ID] = enable;
         } else if (TextUtils.equals(apnType, Phone.APN_TYPE_MMS)) {
             dataEnabled[APN_MMS_ID] = enable;
+        } else if (TextUtils.equals(apnType, Phone.APN_TYPE_SUPL)) {
+            dataEnabled[APN_SUPL_ID] = enable;
         }
         Log.d(LOG_TAG, "dataEnabled[DEFAULT_APN]=" + dataEnabled[APN_DEFAULT_ID] +
-                " dataEnabled[MMS_APN]=" + dataEnabled[APN_MMS_ID]);
+                " dataEnabled[MMS_APN]=" + dataEnabled[APN_MMS_ID] +
+                " dataEnabled[SUPL_APN]=" + dataEnabled[APN_SUPL_ID]);
     }
 
     /**
@@ -476,13 +480,14 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
             return trySetupData(Phone.REASON_DATA_ENABLED);
         } else if (!enable) {
             setEnabled(Phone.APN_TYPE_DEFAULT, false);
-            // Don't tear down if there is an active APN and it handles MMS.
+            // Don't tear down if there is an active APN and it handles MMS or SUPL.
             // TODO: This isn't very general.
-            if (!isApnTypeActive(Phone.APN_TYPE_MMS) || !isEnabled(Phone.APN_TYPE_MMS)) {
-                cleanUpConnection(true, Phone.REASON_DATA_DISABLED);
-                return true;
+            if ((isApnTypeActive(Phone.APN_TYPE_MMS) && isEnabled(Phone.APN_TYPE_MMS)) ||
+                (isApnTypeActive(Phone.APN_TYPE_SUPL) && isEnabled(Phone.APN_TYPE_SUPL))) {
+                return false;
             }
-            return false;
+            cleanUpConnection(true, Phone.REASON_DATA_DISABLED);
+            return true;
         } else {
             // isEnabled && enable
             return true;
@@ -513,7 +518,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
      * {@code true} otherwise.
      */
     public boolean getAnyDataEnabled() {
-        return dataEnabled[APN_DEFAULT_ID] || dataEnabled[APN_MMS_ID];
+        return dataEnabled[APN_DEFAULT_ID] || dataEnabled[APN_MMS_ID] || dataEnabled[APN_SUPL_ID];
     }
 
     /**
@@ -785,7 +790,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
     private boolean
     pdpStatesHasActiveCID (ArrayList<PDPContextState> states, int cid) {
         for (int i = 0, s = states.size() ; i < s ; i++) {
-            if (states.get(i).cid == cid) return states.get(i).active;
+            if (states.get(i).cid == cid) return (states.get(i).active != 0);
         }
 
         return false;
@@ -1316,7 +1321,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
              * rather an app that inadvertantly fails to reset to the
              * default APN, or that dies before doing so.
              */
-            if (dataEnabled[APN_MMS_ID]) {
+            if (dataEnabled[APN_MMS_ID] || dataEnabled[APN_SUPL_ID]) {
                 removeMessages(EVENT_RESTORE_DEFAULT_APN);
                 sendMessageDelayed(obtainMessage(EVENT_RESTORE_DEFAULT_APN),
                         getRestoreDefaultApnDelay());
diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java b/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
index 8ecf2454cab9..9ab1002d646f 100644
--- a/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
+++ b/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
@@ -539,7 +539,7 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
                 EventLog.List val = new EventLog.List(
                         dcTracker.getStateInString(),
                         (dcTracker.getAnyDataEnabled() ? 1 : 0) );
-                EventLog.writeEvent(TelephonyEventLog.EVENT_DATA_STATE_RADIO_OFF, val);
+                EventLog.writeEvent(TelephonyEventLog.EVENT_LOG_DATA_STATE_RADIO_OFF, val);
             }
             dcTracker.cleanConnectionBeforeRadioOff();
             
diff --git a/telephony/java/com/android/internal/telephony/gsm/PDPContextState.java b/telephony/java/com/android/internal/telephony/gsm/PDPContextState.java
index feb78f81153a..31cdacf53190 100644
--- a/telephony/java/com/android/internal/telephony/gsm/PDPContextState.java
+++ b/telephony/java/com/android/internal/telephony/gsm/PDPContextState.java
@@ -21,7 +21,7 @@ package com.android.internal.telephony.gsm;
  */
 public class PDPContextState {
     public int cid;
-    public boolean active;
+    public int active;
     public String type;
     public String apn;
     public String address;
diff --git a/telephony/java/com/android/internal/telephony/gsm/SIMRecords.java b/telephony/java/com/android/internal/telephony/gsm/SIMRecords.java
index 09a17f5eaa42..f9015d92dce2 100644
--- a/telephony/java/com/android/internal/telephony/gsm/SIMRecords.java
+++ b/telephony/java/com/android/internal/telephony/gsm/SIMRecords.java
@@ -1099,14 +1099,9 @@ public final class SIMRecords extends IccRecords {
 
             // Note: Data may include trailing FF's.  That's OK; message
             // should still parse correctly.
-            byte[] nba = new byte[n - 1];
-            System.arraycopy(ba, 1, nba, 0, n - 1);
-
-            String pdu = IccUtils.bytesToHexString(nba);
-            // XXX first line is bogus
-            SmsMessage message = SmsMessage.newFromCMT(
-                                new String[] { "", pdu });
-
+            byte[] pdu = new byte[n - 1];
+            System.arraycopy(ba, 1, pdu, 0, n - 1);
+            SmsMessage message = SmsMessage.createFromPdu(pdu);
 
             ((GSMPhone) phone).mSMS.dispatchMessage(message);
         }
@@ -1130,14 +1125,9 @@ public final class SIMRecords extends IccRecords {
 
                 // Note: Data may include trailing FF's.  That's OK; message
                 // should still parse correctly.
-                byte[] nba = new byte[n - 1];
-                System.arraycopy(ba, 1, nba, 0, n - 1);
-
-                String pdu = IccUtils.bytesToHexString(nba);
-                // XXX first line is bogus
-                SmsMessage message = SmsMessage.newFromCMT(
-                        new String[] { "", pdu });
-
+                byte[] pdu = new byte[n - 1];
+                System.arraycopy(ba, 1, pdu, 0, n - 1);
+                SmsMessage message = SmsMessage.createFromPdu(pdu);
 
                 ((GSMPhone) phone).mSMS.dispatchMessage(message);
 
@@ -1499,6 +1489,3 @@ public final class SIMRecords extends IccRecords {
     }
 
 }
-
-
-
diff --git a/telephony/java/com/android/internal/telephony/test/SimulatedCommands.java b/telephony/java/com/android/internal/telephony/test/SimulatedCommands.java
index 3e53654a4c44..cb09ceab768b 100644
--- a/telephony/java/com/android/internal/telephony/test/SimulatedCommands.java
+++ b/telephony/java/com/android/internal/telephony/test/SimulatedCommands.java
@@ -832,22 +832,30 @@ public final class SimulatedCommands extends BaseCommands
     }
 
     /**
-     * response.obj.result is an String[3]
-     * response.obj.result[0] is registration state 0-5 from TS 27.007 7.2
-     * response.obj.result[1] is LAC if registered or NULL if not
-     * response.obj.result[2] is CID if registered or NULL if not
-     * valid LAC are 0x0000 - 0xffff
-     * valid CID are 0x00000000 - 0xffffffff
+     * response.obj.result is an String[14]
+     * See ril.h for details
      *
      * Please note that registration state 4 ("unknown") is treated
      * as "out of service" above
      */
     public void getRegistrationState (Message result) {
-        String ret[] = new String[3];
+        String ret[] = new String[14];
 
         ret[0] = "5"; // registered roam
         ret[1] = null;
         ret[2] = null;
+        ret[3] = null;
+        ret[4] = null;
+        ret[5] = null;
+        ret[6] = null;
+        ret[7] = null;
+        ret[8] = null;
+        ret[9] = null;
+        ret[10] = null;
+        ret[11] = null;
+        ret[12] = null;
+        ret[13] = null;
+        ret[14] = null;
 
         resultSuccess(result, ret);
     }
diff --git a/telephony/jni/cdmasms/Android.mk b/telephony/jni/cdmasms/Android.mk
deleted file mode 100644
index b0c96b4361a2..000000000000
--- a/telephony/jni/cdmasms/Android.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES:= \
-  cdma_sms_jni.cpp
-
-LOCAL_SHARED_LIBRARIES := \
-	libcutils \
-	libutils \
-	libandroid_runtime \
-	libnativehelper
-
-LOCAL_MODULE:= libcdma_sms_jni
-
-LOCAL_C_INCLUDES += \
-	$(JNI_H_INCLUDE) \
-	hardware/ril/include/telephony
-
-LOCAL_C_INCLUDES += hardware/ril/reference-cdma-sms
-LOCAL_SHARED_LIBRARIES += libreference-cdma-sms
-LOCAL_CFLAGS += -DREFERENCE_CDMA_SMS
-
-LOCAL_PRELINK_MODULE := false
-include $(BUILD_SHARED_LIBRARY)
diff --git a/telephony/jni/cdmasms/cdma_sms_jni.cpp b/telephony/jni/cdmasms/cdma_sms_jni.cpp
deleted file mode 100644
index 2a8e8254f33f..000000000000
--- a/telephony/jni/cdmasms/cdma_sms_jni.cpp
+++ /dev/null
@@ -1,1300 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * @file cdma_sms_jni.cpp
- *
- * This file implement the Java Native Interface
- * for encoding and decoding of SMS
- */
-
-
-#include <nativehelper/jni.h>
-#include <nativehelper/JNIHelp.h>
-#include <android_runtime/AndroidRuntime.h>
-#include <cdma_sms_jni.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif //__cplusplus
-
-#include <reference-cdma-sms.h>
-
-#ifdef __cplusplus
-}
-#endif //__cplusplus
-
-#undef LOG_TAG
-#define LOG_TAG "CDMA"
-#include <utils/Log.h>
-
-static RIL_CDMA_SMS_ClientBd *clientBdData = NULL;
-
-
-static jint getObjectIntField(JNIEnv * env, jobject obj, const char *name, jint * value)
-{
-    jclass clazz;
-    jfieldID field;
-
-#ifdef DBG_LOG_LEVEL_B
-    LOGD("getObjectIntField():");
-#endif
-
-    clazz = env->GetObjectClass(obj);
-    if (NULL == clazz) {
-        jniThrowException(env, "java/lang/Exception", NULL);
-        return JNI_FAILURE;
-    }
-
-    field = env->GetFieldID(clazz, name, "I");
-    env->DeleteLocalRef(clazz);
-
-    if (NULL == field) {
-        jniThrowException(env, "java/lang/NoSuchFieldException", name);
-        return JNI_FAILURE;
-    }
-
-    *value = env->GetIntField(obj, field);
-
-#ifdef DBG_LOG_LEVEL_B
-    LOGD("  %s = %d\n", name, *value);
-#endif
-
-    return JNI_SUCCESS;
-}
-
-static jint setObjectIntField(JNIEnv * env, jobject obj, const char *name, jint value)
-{
-    jclass clazz;
-    jfieldID field;
-
-#ifdef DBG_LOG_LEVEL_B
-    LOGD("setObjectIntField(): %s = %d\n", name, value);
-#endif
-
-    clazz = env->GetObjectClass(obj);
-    if (NULL == clazz) {
-        jniThrowException(env, "java/lang/Exception", NULL);
-        return JNI_FAILURE;
-    }
-
-    field = env->GetFieldID(clazz, name, "I");
-    env->DeleteLocalRef(clazz);
-
-    if (NULL == field) {
-        jniThrowException(env, "java/lang/NoSuchFieldException", name);
-        return JNI_FAILURE;
-    }
-
-    env->SetIntField(obj, field, value);
-
-    return JNI_SUCCESS;
-}
-
-static jint getObjectByteField(JNIEnv * env, jobject obj, const char *name, jbyte * value)
-{
-    jclass clazz;
-    jfieldID field;
-
-#ifdef DBG_LOG_LEVEL_B
-    LOGD("getObjectByteField():");
-#endif
-
-    clazz = env->GetObjectClass(obj);
-    if (NULL == clazz) {
-        jniThrowException(env, "java/lang/Exception", NULL);
-        return JNI_FAILURE;
-    }
-
-    field = env->GetFieldID(clazz, name, "B");
-    env->DeleteLocalRef(clazz);
-
-    if (NULL == field) {
-        jniThrowException(env, "java/lang/NoSuchFieldException", name);
-        return JNI_FAILURE;
-    }
-
-    *value = env->GetByteField(obj, field);
-
-#ifdef DBG_LOG_LEVEL_B
-    LOGD("  %s = %02x\n", name, *value);
-#endif
-
-    return JNI_SUCCESS;
-}
-
-static jint setObjectByteField(JNIEnv * env, jobject obj, const char *name, jbyte value)
-{
-    jclass clazz;
-    jfieldID field;
-#ifdef DBG_LOG_LEVEL_B
-    LOGD("setObjectByteField(): %s = 0x%02x\n", name, value);
-#endif
-
-    clazz = env->GetObjectClass(obj);
-    if (NULL == clazz) {
-        jniThrowException(env, "java/lang/Exception", NULL);
-        return JNI_FAILURE;
-    }
-
-    field = env->GetFieldID(clazz, name, "B");
-    env->DeleteLocalRef(clazz);
-
-    if (NULL == field) {
-        jniThrowException(env, "java/lang/NoSuchFieldException", name);
-        return JNI_FAILURE;
-    }
-
-    env->SetByteField(obj, field, value);
-
-    return JNI_SUCCESS;
-}
-
-static jint getObjectBooleanField(JNIEnv * env, jobject obj, const char *name, jboolean * value)
-{
-    jclass clazz;
-    jfieldID field;
-
-#ifdef DBG_LOG_LEVEL_B
-    LOGD("getObjectBooleanField():");
-#endif
-
-    clazz = env->GetObjectClass(obj);
-    if (NULL == clazz) {
-        jniThrowException(env, "java/lang/Exception", NULL);
-        return JNI_FAILURE;
-    }
-
-    field = env->GetFieldID(clazz, name, "Z");
-    env->DeleteLocalRef(clazz);
-
-    if (NULL == field) {
-        jniThrowException(env, "java/lang/NoSuchFieldException", name);
-        return JNI_FAILURE;
-    }
-
-    *value = env->GetBooleanField(obj, field);
-
-#ifdef DBG_LOG_LEVEL_B
-    LOGD("  %s = %d\n", name, *value);
-#endif
-
-    return JNI_SUCCESS;
-}
-
-static jint setObjectBooleanField(JNIEnv * env, jobject obj, const char *name, jboolean value)
-{
-    jclass clazz;
-    jfieldID field;
-
-#ifdef DBG_LOG_LEVEL_B
-    LOGD("setObjectBooleanField(): %s = %d\n", name, value);
-#endif
-
-    clazz = env->GetObjectClass(obj);
-    if (NULL == clazz) {
-        jniThrowException(env, "java/lang/Exception", NULL);
-        return JNI_FAILURE;
-    }
-
-    field = env->GetFieldID(clazz, name, "Z");
-    env->DeleteLocalRef(clazz);
-
-    if (NULL == field) {
-        jniThrowException(env, "java/lang/NoSuchFieldException", name);
-        return JNI_FAILURE;
-    }
-
-    env->SetBooleanField(obj, field, value);
-
-    return JNI_SUCCESS;
-}
-
-static jint getObjectByteArrayField(JNIEnv * env, jobject obj, const char *name, jbyte* arrData, int* length)
-{
-    jclass clazz;
-    jfieldID field;
-    jbyte * data_buf;
-
-#ifdef DBG_LOG_LEVEL_B
-    LOGD("getObjectByteArrayField(): %s\n", name);
-#endif
-
-    clazz = env->GetObjectClass(obj);
-    if (NULL == clazz) {
-        jniThrowException(env, "java/lang/Exception", NULL);
-        return JNI_FAILURE;
-    }
-
-    field = env->GetFieldID(clazz, name, "[B");
-    env->DeleteLocalRef(clazz);
-
-    if (NULL == field) {
-        jniThrowException(env, "java/lang/NoSuchFieldException", name);
-        return JNI_FAILURE;
-    }
-
-    jbyteArray buffer = (jbyteArray)(env->GetObjectField(obj, field));
-    if (buffer != NULL) {
-        int len = env->GetArrayLength(buffer);
-        data_buf = env->GetByteArrayElements(buffer, NULL);
-        for (int i=0; i<len; i++) {
-            *arrData++ = data_buf[i];
-#ifdef DBG_LOG_LEVEL_B
-            LOGD("  [%d] = 0x%02x\n", i, data_buf[i]);
-#endif
-        }
-        *length = len;
-    } else {
-        jniThrowException(env, "java/lang/NullPointerException", NULL);
-        return JNI_FAILURE;
-    }
-
-    return JNI_SUCCESS;
-}
-
-static jint setObjectByteArrayField(JNIEnv * env, jobject obj, const char *name, jbyte* arrData, int length)
-{
-    jclass clazz;
-    jfieldID field;
-    jbyte* byte_buf;
-
-#ifdef DBG_LOG_LEVEL_B
-    LOGD("setObjectByteArrayField(): %s\n", name);
-#endif
-
-    clazz = env->GetObjectClass(obj);
-    if (NULL == clazz) {
-        jniThrowException(env, "java/lang/Exception", NULL);
-        return JNI_FAILURE;
-    }
-
-    field = env->GetFieldID(clazz, name, "[B");
-    env->DeleteLocalRef(clazz);
-
-    if (NULL == field) {
-        jniThrowException(env, "java/lang/NoSuchFieldException", name);
-        return JNI_FAILURE;
-    }
-
-    jbyteArray buffer = (jbyteArray)(env->GetObjectField(obj, field));
-    if (buffer == NULL) {
-#ifdef DBG_LOG_LEVEL_B
-        LOGD("setObjectByteArrayField(): %s = null\n", name);
-#endif
-        buffer = env->NewByteArray(length);
-        env->SetObjectField(obj, field, buffer);
-    }
-
-    if (buffer != NULL) {
-#ifdef DBG_LOG_LEVEL_B
-        for (int i=0; i<length; i++) {
-            LOGD("  [%d] = 0x%02x\n", i, arrData[i]);
-        }
-#endif
-        env->SetByteArrayRegion(buffer, 0, length, arrData);
-    } else {
-        jniThrowException(env, "java/lang/NullPointerException", NULL);
-        return JNI_FAILURE;
-    }
-
-    return JNI_SUCCESS;
-}
-
-
-/* native interface */
-JNIEXPORT jint JNICALL
-Java_com_android_internal_telephony_cdma_sms_SmsDataCoding_nativeCdmaSmsConstructClientBD
-  (JNIEnv * env, jobject obj)
-{
-#ifdef DBG_LOG_LEVEL_B
-    LOGD("nativeCdmaSmsConstructClientBD()...\n");
-#endif
-
-    clientBdData = (RIL_CDMA_SMS_ClientBd *)malloc(sizeof(RIL_CDMA_SMS_ClientBd));
-    if (NULL == clientBdData) {
-        jniThrowException(env, "java/lang/OutOfMemoryError", "clientBdData memory allocation failed");
-        return JNI_FAILURE;
-    }
-    memset(clientBdData, 0, sizeof(RIL_CDMA_SMS_ClientBd));
-    return JNI_SUCCESS;
-}
-
-
-/* native interface */
-JNIEXPORT jint JNICALL
-Java_com_android_internal_telephony_cdma_sms_SmsDataCoding_nativeCdmaSmsDestructClientBD
-  (JNIEnv * env, jobject obj)
-{
-#ifdef DBG_LOG_LEVEL_B
-    LOGD("nativeCdmaSmsDestructClientBD()...\n");
-#endif
-
-    if (clientBdData == NULL) {
-        jniThrowException(env, "java/lang/NullPointerException", "clientBdData is null");
-        return JNI_FAILURE;
-    }
-    free(clientBdData);
-    return JNI_SUCCESS;
-}
-
-
-/* native interface */
-JNIEXPORT jint JNICALL
-Java_com_android_internal_telephony_cdma_sms_SmsDataCoding_nativeCdmaSmsSetBearerDataPrimitives
-  (JNIEnv * env, jobject obj, jobject bearerData)
-{
-    jbyteArray mc_time = NULL;
-    jbyte mctime_buffer[6];
-    int length;
-    jint intData;
-    jbyte byteData;
-    jboolean booleanData;
-
-#ifdef DBG_LOG_LEVEL_B
-    LOGD("nativeCdmaSmsSetBearerDataPrimitives()...\n");
-#endif
-
-    // mask
-    if (getObjectIntField(env, bearerData, "mask", &intData) != JNI_SUCCESS)
-        return JNI_FAILURE;
-    clientBdData->mask = intData;
-#ifdef DBG_LOG_LEVEL_A
-    LOGD("clientBdData->mask = 0x%x\n", clientBdData->mask);
-#endif
-
-    // message_id.type
-    if (getObjectByteField(env, bearerData, "messageType", &byteData) != JNI_SUCCESS)
-        return JNI_FAILURE;
-    clientBdData->message_id.type = (RIL_CDMA_SMS_BdMessageType)(byteData);
-#ifdef DBG_LOG_LEVEL_A
-    LOGD("clientBdData->message_id.type = 0x%02x\n", clientBdData->message_id.type);
-#endif
-
-    // message_id.id_number
-    if ((clientBdData->mask & WMS_MASK_BD_MSG_ID) == WMS_MASK_BD_MSG_ID) {
-        if (getObjectIntField(env, bearerData, "messageID", &intData) != JNI_SUCCESS)
-            return JNI_FAILURE;
-        clientBdData->message_id.id_number = (RIL_CDMA_SMS_MessageNumber)(intData);
-#ifdef DBG_LOG_LEVEL_A
-        LOGD("clientBdData->message_id.id_number = %d\n", clientBdData->message_id.id_number);
-#endif
-    }
-
-    // message_id.udh_present
-    if (getObjectBooleanField(env, bearerData, "hasUserDataHeader", &booleanData) != JNI_SUCCESS)
-        return JNI_FAILURE;
-    clientBdData->message_id.udh_present = (unsigned char)(booleanData);
-#ifdef DBG_LOG_LEVEL_A
-    LOGD("clientBdData->message_id.udh_present = %d\n", clientBdData->message_id.udh_present);
-#endif
-
-    // user_response
-    // TODO
-
-    // mc_time
-    if ((clientBdData->mask & WMS_MASK_BD_MC_TIME) == WMS_MASK_BD_MC_TIME) {
-        if (getObjectByteArrayField(env, bearerData, "timeStamp", mctime_buffer, &length) != JNI_SUCCESS)
-            return JNI_FAILURE;
-        if (mctime_buffer != NULL) {
-            clientBdData->mc_time.year     = mctime_buffer[0];
-            clientBdData->mc_time.month    = mctime_buffer[1];
-            clientBdData->mc_time.day      = mctime_buffer[2];
-            clientBdData->mc_time.hour     = mctime_buffer[3];
-            clientBdData->mc_time.minute   = mctime_buffer[4];
-            clientBdData->mc_time.second   = mctime_buffer[5];
-#ifdef DBG_LOG_LEVEL_A
-            LOGD("clientBdData->mc_time.year   = %d\n", clientBdData->mc_time.year);
-            LOGD("clientBdData->mc_time.month  = %d\n", clientBdData->mc_time.month);
-            LOGD("clientBdData->mc_time.day    = %d\n", clientBdData->mc_time.day);
-            LOGD("clientBdData->mc_time.hour   = %d\n", clientBdData->mc_time.hour);
-            LOGD("clientBdData->mc_time.minute = %d\n", clientBdData->mc_time.minute);
-            LOGD("clientBdData->mc_time.second = %d\n", clientBdData->mc_time.second);
-#endif
-        }
-    }
-
-    // clientBdData->mc_time.timezone
-    // TODO
-
-    // validity_absolute;
-    // TODO
-
-    // validity_relative;
-    // TODO
-
-    // deferred_absolute
-    // TODO
-
-    // deferred_relative;
-    // TODO
-
-    // priority
-    // TODO
-
-    // privacy
-    // TODO
-
-    if ((clientBdData->mask & WMS_MASK_BD_REPLY_OPTION) == WMS_MASK_BD_REPLY_OPTION) {
-        // reply_option.user_ack_requested
-        if (getObjectBooleanField(env, bearerData, "userAckReq", &booleanData) != JNI_SUCCESS)
-            return JNI_FAILURE;
-        clientBdData->reply_option.user_ack_requested = (unsigned char)(booleanData);
-#ifdef DBG_LOG_LEVEL_A
-        LOGD("clientBdData->reply_option.user_ack_requested = %d\n", clientBdData->reply_option.user_ack_requested);
-#endif
-        // reply_option.user_ack_requested
-        if (getObjectBooleanField(env, bearerData, "deliveryAckReq", &booleanData) != JNI_SUCCESS)
-            return JNI_FAILURE;
-        clientBdData->reply_option.delivery_ack_requested = (unsigned char)(booleanData);
-#ifdef DBG_LOG_LEVEL_A
-        LOGD("clientBdData->reply_option.delivery_ack_requested = %d\n", clientBdData->reply_option.delivery_ack_requested);
-#endif
-        // reply_option.user_ack_requested
-        if (getObjectBooleanField(env, bearerData, "readAckReq", &booleanData) != JNI_SUCCESS)
-            return JNI_FAILURE;
-        clientBdData->reply_option.read_ack_requested = (unsigned char)(booleanData);
-#ifdef DBG_LOG_LEVEL_A
-            LOGD("clientBdData->reply_option.read_ack_requested = %d\n", clientBdData->reply_option.read_ack_requested);
-#endif
-    }
-
-    // num_messages
-    if ((clientBdData->mask & WMS_MASK_BD_NUM_OF_MSGS) == WMS_MASK_BD_NUM_OF_MSGS) {
-        if (getObjectIntField(env, bearerData, "numberOfMessages", &intData) != JNI_SUCCESS)
-            return JNI_FAILURE;
-        clientBdData->num_messages = (unsigned char)(intData);
-#ifdef DBG_LOG_LEVEL_A
-        LOGD("clientBdData->num_messages = %d\n", clientBdData->num_messages);
-#endif
-    }
-
-    // alert_mode
-    // TODO
-
-    // language
-    // TODO
-
-    // display_mode
-    if ((clientBdData->mask & WMS_MASK_BD_DISPLAY_MODE) == WMS_MASK_BD_DISPLAY_MODE) {
-        if (getObjectByteField(env, bearerData, "displayMode", &byteData) != JNI_SUCCESS)
-            return JNI_FAILURE;
-        clientBdData->display_mode = (RIL_CDMA_SMS_DisplayMode)(byteData);
-#ifdef DBG_LOG_LEVEL_A
-        LOGD("clientBdData->display_mode = 0x%02x\n", clientBdData->display_mode);
-#endif
-    }
-
-    // delivery_status
-    if ((clientBdData->mask & WMS_MASK_BD_DELIVERY_STATUS) == WMS_MASK_BD_DELIVERY_STATUS) {
-        // delivery_status.error_class
-        if (getObjectIntField(env, bearerData, "errorClass", &intData) != JNI_SUCCESS)
-            return JNI_FAILURE;
-        clientBdData->delivery_status.error_class = (RIL_CDMA_SMS_ErrorClass)(intData);
-#ifdef DBG_LOG_LEVEL_A
-        LOGD("clientBdData->delivery_status.error_class = %d\n", clientBdData->delivery_status.error_class);
-#endif
-        // delivery_status.status
-        if (getObjectIntField(env, bearerData, "messageStatus", &intData) != JNI_SUCCESS)
-            return JNI_FAILURE;
-        clientBdData->delivery_status.status = (RIL_CDMA_SMS_DeliveryStatusE)(intData);
-#ifdef DBG_LOG_LEVEL_A
-        LOGD("clientBdData->delivery_status.status = %d\n", clientBdData->delivery_status.status);
-#endif
-    }
-
-    // deposit_index
-    // TODO
-
-    // ip_address
-    // TODO
-
-    // rsn_no_notify
-    // TODO
-
-    // other
-    // TODO
-
-    return JNI_SUCCESS;
-}
-
-
-/* native interface */
-JNIEXPORT jint JNICALL
-Java_com_android_internal_telephony_cdma_sms_SmsDataCoding_nativeCdmaSmsGetBearerDataPrimitives
-  (JNIEnv * env, jobject obj, jobject bearerData)
-{
-    jclass BearerDataClass;
-    jfieldID field;
-    jbyte mctime_buffer[6];
-    jbyteArray addr_array;
-    int length;
-
-#ifdef DBG_LOG_LEVEL_B
-    LOGD("nativeCdmaSmsGetBearerDataPrimitives()...\n");
-#endif
-
-    // mask
-#ifdef DBG_LOG_LEVEL_A
-    LOGD("clientBdData->mask = 0x%x\n", clientBdData->mask);
-#endif
-    if (setObjectIntField(env, bearerData, "mask", clientBdData->mask) != JNI_SUCCESS)
-        return JNI_FAILURE;
-
-    // message_id.type
-#ifdef DBG_LOG_LEVEL_A
-    LOGD("clientBdData->message_id.type = 0x%02x\n", clientBdData->message_id.type);
-#endif
-    if (setObjectByteField(env, bearerData, "messageType", (jbyte)clientBdData->message_id.type) != JNI_SUCCESS)
-        return JNI_FAILURE;
-
-    // message_id.id_number
-    if ((clientBdData->mask & WMS_MASK_BD_MSG_ID) == WMS_MASK_BD_MSG_ID) {
-#ifdef DBG_LOG_LEVEL_A
-        LOGD("clientBdData->message_id.id_number = %d\n", clientBdData->message_id.id_number);
-#endif
-        if (setObjectIntField(env, bearerData, "messageID", clientBdData->message_id.id_number) != JNI_SUCCESS)
-            return JNI_FAILURE;
-    }
-
-    // message_id.udh_present
-#ifdef DBG_LOG_LEVEL_A
-    LOGD("clientBdData->message_id.udh_present = %d\n", clientBdData->message_id.udh_present);
-#endif
-    if (setObjectBooleanField(env, bearerData, "hasUserDataHeader", (jboolean)clientBdData->message_id.udh_present) != JNI_SUCCESS)
-        return JNI_FAILURE;
-
-    // user_response
-    // TODO
-
-    // mc_time
-    if ((clientBdData->mask & WMS_MASK_BD_MC_TIME) == WMS_MASK_BD_MC_TIME) {
-        jclass clazz= env->GetObjectClass(bearerData);
-        if (NULL == clazz)
-            return JNI_FAILURE;
-        jfieldID field = env->GetFieldID(clazz, "timeStamp", "[B");
-        env->DeleteLocalRef(clazz);
-
-        addr_array = env->NewByteArray((jsize)6);
-        env->SetObjectField(bearerData, field, addr_array);
-
-#ifdef DBG_LOG_LEVEL_A
-        LOGD("clientBdData->mc_time.year   = %d\n", clientBdData->mc_time.year);
-        LOGD("clientBdData->mc_time.month  = %d\n", clientBdData->mc_time.month);
-        LOGD("clientBdData->mc_time.day    = %d\n", clientBdData->mc_time.day);
-        LOGD("clientBdData->mc_time.hour   = %d\n", clientBdData->mc_time.hour);
-        LOGD("clientBdData->mc_time.minute = %d\n", clientBdData->mc_time.minute);
-        LOGD("clientBdData->mc_time.second = %d\n", clientBdData->mc_time.second);
-#endif
-        mctime_buffer[0] = clientBdData->mc_time.year;
-        mctime_buffer[1] = clientBdData->mc_time.month;
-        mctime_buffer[2] = clientBdData->mc_time.day;
-        mctime_buffer[3] = clientBdData->mc_time.hour;
-        mctime_buffer[4] = clientBdData->mc_time.minute;
-        mctime_buffer[5] = clientBdData->mc_time.second;
-        length = sizeof(mctime_buffer) / sizeof(jbyte);
-        if (setObjectByteArrayField(env, bearerData, "timeStamp", mctime_buffer, length) != JNI_SUCCESS)
-            return JNI_FAILURE;
-    }
-
-    // clientBdData->mc_time.timezone
-    // TODO
-
-    // validity_absolute;
-    // TODO
-
-    // validity_relative;
-    // TODO
-
-    // deferred_absolute
-    // TODO
-
-    // deferred_relative;
-    // TODO
-
-    // priority
-    // TODO
-
-    // privacy
-    // TODO
-
-    if ((clientBdData->mask & WMS_MASK_BD_REPLY_OPTION) == WMS_MASK_BD_REPLY_OPTION) {
-        // reply_option.user_ack_requested
-#ifdef DBG_LOG_LEVEL_A
-        LOGD("clientBdData->reply_option.user_ack_requested = %d\n", clientBdData->reply_option.user_ack_requested);
-#endif
-        if (setObjectBooleanField(env, bearerData, "userAckReq", (jboolean)clientBdData->reply_option.user_ack_requested) != JNI_SUCCESS)
-            return JNI_FAILURE;
-
-        // reply_option.user_ack_requested
-#ifdef DBG_LOG_LEVEL_A
-        LOGD("clientBdData->reply_option.delivery_ack_requested = %d\n", clientBdData->reply_option.delivery_ack_requested);
-#endif
-        if (setObjectBooleanField(env, bearerData, "deliveryAckReq", (jboolean)clientBdData->reply_option.delivery_ack_requested) != JNI_SUCCESS)
-            return JNI_FAILURE;
-
-        // reply_option.user_ack_requested
-#ifdef DBG_LOG_LEVEL_A
-        LOGD("clientBdData->reply_option.read_ack_requested = %d\n", clientBdData->reply_option.read_ack_requested);
-#endif
-        if (setObjectBooleanField(env, bearerData, "readAckReq", (jboolean)clientBdData->reply_option.read_ack_requested) != JNI_SUCCESS)
-            return JNI_FAILURE;
-    }
-
-    // num_messages
-    if ((clientBdData->mask & WMS_MASK_BD_NUM_OF_MSGS) == WMS_MASK_BD_NUM_OF_MSGS) {
-#ifdef DBG_LOG_LEVEL_A
-        LOGD("clientBdData->num_messages = %d\n", clientBdData->num_messages);
-#endif
-        if (setObjectIntField(env, bearerData, "numberOfMessages", (int)clientBdData->num_messages) != JNI_SUCCESS)
-            return JNI_FAILURE;
-    }
-
-    // alert_mode
-    // TODO
-
-    // language
-    // TODO
-
-    // display_mode
-    if ((clientBdData->mask & WMS_MASK_BD_DISPLAY_MODE) == WMS_MASK_BD_DISPLAY_MODE) {
-#ifdef DBG_LOG_LEVEL_A
-        LOGD("clientBdData->display_mode = 0x%02x\n", clientBdData->display_mode);
-#endif
-        if (setObjectByteField(env, bearerData, "displayMode", (jbyte)clientBdData->display_mode) != JNI_SUCCESS)
-            return JNI_FAILURE;
-    }
-
-    // delivery_status
-    if ((clientBdData->mask & WMS_MASK_BD_DELIVERY_STATUS) == WMS_MASK_BD_DELIVERY_STATUS) {
-#ifdef DBG_LOG_LEVEL_A
-        LOGD("clientBdData->delivery_status.error_class = %d\n", clientBdData->delivery_status.error_class);
-#endif
-        // delivery_status.error_class
-        if (setObjectIntField(env, bearerData, "errorClass", (int)clientBdData->delivery_status.error_class) != JNI_SUCCESS)
-            return JNI_FAILURE;
-#ifdef DBG_LOG_LEVEL_A
-        LOGD("clientBdData->delivery_status.status = %d\n", clientBdData->delivery_status.status);
-#endif
-        // delivery_status.status
-        if (setObjectIntField(env, bearerData, "messageStatus", (int)clientBdData->delivery_status.status) != JNI_SUCCESS)
-            return JNI_FAILURE;
-    }
-
-    // deposit_index
-    // TODO
-
-    // ip_address
-    // TODO
-
-    // rsn_no_notify
-    // TODO
-
-    // other
-    // TODO
-
-    return JNI_SUCCESS;
-}
-
-
-/* native interface */
-JNIEXPORT jint JNICALL
-Java_com_android_internal_telephony_cdma_sms_SmsDataCoding_nativeCdmaSmsSetUserData
-  (JNIEnv * env, jobject obj, jobject userData)
-{
-    jclass UserDataClass;
-    jfieldID field;
-    jbyteArray arrData = NULL;
-    jbyte data_buf[RIL_CDMA_SMS_USER_DATA_MAX];
-    int length;
-    jint intData;
-    jbyte byteData;
-    jboolean booleanData;
-
-#ifdef DBG_LOG_LEVEL_B
-    LOGD("nativeCdmaSmsSetUserData()...\n");
-#endif
-
-    // set num_headers to 0 here, increment later
-    clientBdData->user_data.num_headers = 0;
-
-    // user_data.encoding
-    if (getObjectIntField(env, userData, "userDataEncoding", &intData) != JNI_SUCCESS)
-        return JNI_FAILURE;
-    clientBdData->user_data.encoding = (RIL_CDMA_SMS_UserDataEncoding)(intData);
-#ifdef DBG_LOG_LEVEL_A
-    LOGD("clientBdData->user_data.encoding = %d\n", clientBdData->user_data.encoding);
-#endif
-
-    // is91ep_type
-    // TODO
-
-    // user_data.padding_bits
-    if (getObjectIntField(env, userData, "paddingBits", &intData) != JNI_SUCCESS)
-        return JNI_FAILURE;
-    clientBdData->user_data.padding_bits = (unsigned char)(intData);
-#ifdef DBG_LOG_LEVEL_A
-    LOGD("clientBdData->user_data.padding_bits = %d\n", clientBdData->user_data.padding_bits);
-#endif
-
-    // user_data.data
-    if (getObjectByteArrayField(env, userData, "userData", data_buf, &length) != JNI_SUCCESS )
-        return JNI_FAILURE;
-    for (int i = 0; i < length; i++) {
-        clientBdData->user_data.data[i] = data_buf[i];
-#ifdef DBG_LOG_LEVEL_A
-        LOGD("clientBdData->user_data.data[%d] = 0x%02x\n", i, clientBdData->user_data.data[i]);
-#endif
-    }
-
-    // user_data.data_len
-    // TODO
-
-    // number_of_digits
-    clientBdData->user_data.number_of_digits = (unsigned char)(length);
-#ifdef DBG_LOG_LEVEL_A
-    LOGD("clientBdData->user_data.number_of_digits = %d\n", clientBdData->user_data.number_of_digits);
-#endif
-
-    return JNI_SUCCESS;
-}
-
-
-/* native interface */
-JNIEXPORT jint JNICALL
-Java_com_android_internal_telephony_cdma_sms_SmsDataCoding_nativeCdmaSmsGetUserData
-  (JNIEnv * env, jobject obj, jobject userData)
-{
-    jclass UserDataClass;
-    jfieldID field;
-    jbyte *data_buf;
-    int length;
-
-#ifdef DBG_LOG_LEVEL_B
-    LOGD("nativeCdmaSmsGetUserData()...\n");
-#endif
-
-    // user_data.num_headers
-//    if (setObjectIntField(env, userData, "mNumberOfHeaders", (int)clientBdData->user_data.num_headers) != JNI_SUCCESS)
-//        return JNI_FAILURE;
-
-    // user_data.encoding
-#ifdef DBG_LOG_LEVEL_A
-    LOGD("clientBdData->user_data.encoding = %d\n", clientBdData->user_data.encoding);
-#endif
-    if (setObjectIntField(env, userData, "userDataEncoding", clientBdData->user_data.encoding) != JNI_SUCCESS)
-        return JNI_FAILURE;
-
-    // is91ep_type
-    // TODO
-
-    // user_data.data_len
-//    if (setObjectIntField(env, userData, "mDataLength", (int)clientBdData->user_data.data_len) != JNI_SUCCESS)
-//        return JNI_FAILURE;
-
-    // user_data.padding_bits
-#ifdef DBG_LOG_LEVEL_A
-    LOGD("clientBdData->user_data.padding_bits = %d\n", clientBdData->user_data.padding_bits);
-#endif
-    if (setObjectIntField(env, userData, "paddingBits", (int)clientBdData->user_data.padding_bits) != JNI_SUCCESS)
-        return JNI_FAILURE;
-
-    // user_data.data
-#ifdef DBG_LOG_LEVEL_A
-    LOGD("clientBdData->user_data.data_len = %d\n", clientBdData->user_data.data_len);
-#endif
-    length = clientBdData->user_data.data_len;
-#ifdef DBG_LOG_LEVEL_A
-    for (int i = 0; i < length; i++) {
-        LOGD("clientBdData->user_data.data[%d] = 0x%02x\n", i, clientBdData->user_data.data[i]);
-    }
-#endif
-    data_buf = (jbyte*)clientBdData->user_data.data;
-    if (setObjectByteArrayField(env, userData, "userData", data_buf, length) != JNI_SUCCESS)
-        return JNI_FAILURE;
-
-    // number_of_digits
-    // TODO
-
-    return JNI_SUCCESS;
-}
-
-
-/* native interface */
-JNIEXPORT jint JNICALL Java_com_android_internal_telephony_cdma_sms_SmsDataCoding_nativeCdmaSmsSetUserDataHeader
-  (JNIEnv * env, jobject obj, jint ID, jbyteArray data, jint length, jint index)
-{
-    jbyte data_buf[length];
-
-#ifdef DBG_LOG_LEVEL_B
-    LOGD("nativeCdmaSmsSetUserDataHeader()...\n");
-#endif
-
-    env->GetByteArrayRegion(data, 0, length, data_buf);
-
-    // user_data.headers[index].header_id
-    clientBdData->user_data.headers[index].header_id = (RIL_CDMA_SMS_UdhId)(ID);
-
-    // user_data.headers[index].u
-    // TODO: add support for all udh id's
-    switch(clientBdData->user_data.headers[index].header_id)
-    {
-        case RIL_CDMA_SMS_UDH_CONCAT_8:
-            clientBdData->user_data.headers[index].u.concat_8.msg_ref  = data_buf[0];
-            clientBdData->user_data.headers[index].u.concat_8.total_sm = data_buf[1];
-            clientBdData->user_data.headers[index].u.concat_8.seq_num  = data_buf[2];
-#ifdef DBG_LOG_LEVEL_A
-            LOGD("clientBdData->user_data.headers[%d].u.concat_8.msg_ref  = 0x%02x\n", index, clientBdData->user_data.headers[index].u.concat_8.msg_ref);
-            LOGD("clientBdData->user_data.headers[%d].u.concat_8.total_sm = 0x%02x\n", index, clientBdData->user_data.headers[index].u.concat_8.total_sm);
-            LOGD("clientBdData->user_data.headers[%d].u.concat_8.seq_num  = 0x%02x\n", index, clientBdData->user_data.headers[index].u.concat_8.seq_num);
-#endif
-        break;
-        case RIL_CDMA_SMS_UDH_SPECIAL_SM:
-            clientBdData->user_data.headers[index].u.special_sm.msg_waiting      = (RIL_CDMA_SMS_GWMsgWaiting)(
-                                                                                   (data_buf[0] << 23) | (data_buf[1] << 15) |
-                                                                                   (data_buf[2] << 7)  |  data_buf[3]);
-            clientBdData->user_data.headers[index].u.special_sm.msg_waiting_kind = (RIL_CDMA_SMS_GWMsgWaitingKind)(
-                                                                                   (data_buf[4] << 23) | (data_buf[5] << 15) |
-                                                                                   (data_buf[6] << 7)  |  data_buf[7]);
-            clientBdData->user_data.headers[index].u.special_sm.message_count    =  data_buf[8];
-#ifdef DBG_LOG_LEVEL_A
-            LOGD("clientBdData->user_data.headers[%d].u.special_sm.msg_waiting      = 0x%04x\n", index, clientBdData->user_data.headers[index].u.special_sm.msg_waiting);
-            LOGD("clientBdData->user_data.headers[%d].u.special_sm.msg_waiting_kind = 0x%04x\n", index, clientBdData->user_data.headers[index].u.special_sm.msg_waiting_kind);
-            LOGD("clientBdData->user_data.headers[%d].u.special_sm.message_count    = 0x%02x\n", index, clientBdData->user_data.headers[index].u.special_sm.message_count);
-#endif
-        break;
-        case RIL_CDMA_SMS_UDH_PORT_8:
-            clientBdData->user_data.headers[index].u.wap_8.dest_port = data_buf[0];
-            clientBdData->user_data.headers[index].u.wap_8.orig_port = data_buf[1];
-#ifdef DBG_LOG_LEVEL_A
-            LOGD("clientBdData->user_data.headers[%d].u.wap_8.dest_port = 0x%02x\n", index, clientBdData->user_data.headers[index].u.wap_8.dest_port);
-            LOGD("clientBdData->user_data.headers[%d].u.wap_8.orig_port = 0x%02x\n", index, clientBdData->user_data.headers[index].u.wap_8.orig_port);
-#endif
-        break;
-        case RIL_CDMA_SMS_UDH_PORT_16:
-            clientBdData->user_data.headers[index].u.wap_16.dest_port = (data_buf[0] << 7) | data_buf[1]; // unsigned short
-            clientBdData->user_data.headers[index].u.wap_16.orig_port = (data_buf[2] << 7) | data_buf[3]; // unsigned short
-#ifdef DBG_LOG_LEVEL_A
-            LOGD("clientBdData->user_data.headers[%d].u.wap_16.dest_port = 0x%04x\n", index, clientBdData->user_data.headers[index].u.wap_16.dest_port);
-            LOGD("clientBdData->user_data.headers[%d].u.wap_16.orig_port = 0x%04x\n", index, clientBdData->user_data.headers[index].u.wap_16.orig_port);
-#endif
-        break;
-        case RIL_CDMA_SMS_UDH_CONCAT_16:
-            clientBdData->user_data.headers[index].u.concat_16.msg_ref  = (data_buf[0] << 7) | data_buf[1]; // unsigned short
-            clientBdData->user_data.headers[index].u.concat_16.total_sm =  data_buf[2];
-            clientBdData->user_data.headers[index].u.concat_16.seq_num  =  data_buf[3];
-#ifdef DBG_LOG_LEVEL_A
-            LOGD("clientBdData->user_data.headers[%d].u.concat_16.msg_ref  = 0x%04x\n", index, clientBdData->user_data.headers[index].u.concat_16.msg_ref);
-            LOGD("clientBdData->user_data.headers[%d].u.concat_16.total_sm = 0x%04x\n", index, clientBdData->user_data.headers[index].u.concat_16.total_sm);
-            LOGD("clientBdData->user_data.headers[%d].u.concat_16.seq_num  = 0x%04x\n", index, clientBdData->user_data.headers[index].u.concat_16.seq_num);
-#endif
-        break;
-        default:
-        break;
-    }
-
-    // increment num_of_headers
-    clientBdData->user_data.num_headers++;
-
-    return JNI_SUCCESS;
-}
-
-
-/* native interface */
-JNIEXPORT jbyteArray JNICALL
-Java_com_android_internal_telephony_cdma_sms_SmsDataCoding_nativeCdmaSmsGetUserDataHeader
-  (JNIEnv * env, jobject obj)
-{
-    jbyteArray arrData = NULL;
-    jbyte data_buf[sizeof(clientBdData->user_data.headers)];
-    int length = 0;
-
-#ifdef DBG_LOG_LEVEL_B
-    LOGD("nativeCdmaSmsGetUserDataHeader()...\n");
-#endif
-
-#ifdef DBG_LOG_LEVEL_A
-    LOGD("clientBdData->user_data.num_headers = %d, size = %d\n", clientBdData->user_data.num_headers, sizeof(clientBdData->user_data.headers));
-#endif
-
-    for (int index = 0; index < clientBdData->user_data.num_headers; index++) {
-        // user_data.headers[index].header_id
-        data_buf[length++] = (jbyte)clientBdData->user_data.headers[index].header_id;
-#ifdef DBG_LOG_LEVEL_A
-        LOGD("clientBdData->user_data.headers[%d].header_id = %d", index, clientBdData->user_data.headers[index].header_id);
-#endif
-
-        // user_data.headers[index].u
-        // TODO: add support for all udh id's
-        switch(clientBdData->user_data.headers[index].header_id)
-        {
-            case RIL_CDMA_SMS_UDH_CONCAT_8:
-#ifdef DBG_LOG_LEVEL_A
-                LOGD("clientBdData->user_data.headers[%d].u.concat_8.msg_ref  = 0x%02x\n", index, clientBdData->user_data.headers[index].u.concat_8.msg_ref);
-                LOGD("clientBdData->user_data.headers[%d].u.concat_8.total_sm = 0x%02x\n", index, clientBdData->user_data.headers[index].u.concat_8.total_sm);
-                LOGD("clientBdData->user_data.headers[%d].u.concat_8.seq_num  = 0x%02x\n", index, clientBdData->user_data.headers[index].u.concat_8.seq_num);
-#endif
-                data_buf[length++] = 3;
-                data_buf[length++] = clientBdData->user_data.headers[index].u.concat_8.msg_ref;
-                data_buf[length++] = clientBdData->user_data.headers[index].u.concat_8.total_sm;
-                data_buf[length++] = clientBdData->user_data.headers[index].u.concat_8.seq_num;
-            break;
-            case RIL_CDMA_SMS_UDH_SPECIAL_SM:
-#ifdef DBG_LOG_LEVEL_A
-                LOGD("clientBdData->user_data.headers[%d].u.special_sm.msg_waiting      = 0x%04x\n", index, clientBdData->user_data.headers[index].u.special_sm.msg_waiting);
-                LOGD("clientBdData->user_data.headers[%d].u.special_sm.msg_waiting_kind = 0x%04x\n", index, clientBdData->user_data.headers[index].u.special_sm.msg_waiting_kind);
-                LOGD("clientBdData->user_data.headers[%d].u.special_sm.message_count    = 0x%02x\n", index, clientBdData->user_data.headers[index].u.special_sm.message_count);
-#endif
-                data_buf[length++] = 9;
-                data_buf[length++] = (clientBdData->user_data.headers[index].u.special_sm.msg_waiting & 0xFF000000) >> 23; // int
-                data_buf[length++] = (clientBdData->user_data.headers[index].u.special_sm.msg_waiting & 0x00FF0000) >> 15;
-                data_buf[length++] = (clientBdData->user_data.headers[index].u.special_sm.msg_waiting & 0x0000FF00) >> 7;
-                data_buf[length++] =  clientBdData->user_data.headers[index].u.special_sm.msg_waiting & 0x000000FF;
-                data_buf[length++] = (clientBdData->user_data.headers[index].u.special_sm.msg_waiting_kind & 0xFF000000) >> 23; // int
-                data_buf[length++] = (clientBdData->user_data.headers[index].u.special_sm.msg_waiting_kind & 0x00FF0000) >> 15;
-                data_buf[length++] = (clientBdData->user_data.headers[index].u.special_sm.msg_waiting_kind & 0x0000FF00) >> 7;
-                data_buf[length++] =  clientBdData->user_data.headers[index].u.special_sm.msg_waiting_kind & 0x000000FF;
-                data_buf[length++] =  clientBdData->user_data.headers[index].u.special_sm.message_count;
-            break;
-            case RIL_CDMA_SMS_UDH_PORT_8:
-#ifdef DBG_LOG_LEVEL_A
-                LOGD("clientBdData->user_data.headers[%d].u.wap_8.dest_port = 0x%02x\n", index, clientBdData->user_data.headers[index].u.wap_8.dest_port);
-                LOGD("clientBdData->user_data.headers[%d].u.wap_8.orig_port = 0x%02x\n", index, clientBdData->user_data.headers[index].u.wap_8.orig_port);
-#endif
-                data_buf[length++] = 2;
-                data_buf[length++] = clientBdData->user_data.headers[index].u.wap_8.dest_port;
-                data_buf[length++] = clientBdData->user_data.headers[index].u.wap_8.orig_port;
-            break;
-            case RIL_CDMA_SMS_UDH_PORT_16:
-#ifdef DBG_LOG_LEVEL_A
-                LOGD("clientBdData->user_data.headers[%d].u.wap_16.dest_port = 0x%04x\n", index, clientBdData->user_data.headers[index].u.wap_16.dest_port);
-                LOGD("clientBdData->user_data.headers[%d].u.wap_16.orig_port = 0x%04x\n", index, clientBdData->user_data.headers[index].u.wap_16.orig_port);
-#endif
-                data_buf[length++] = 4;
-                data_buf[length++] = (clientBdData->user_data.headers[index].u.wap_16.dest_port & 0xFF00) >> 7; // unsigned short
-                data_buf[length++] =  clientBdData->user_data.headers[index].u.wap_16.dest_port & 0x00FF;
-                data_buf[length++] = (clientBdData->user_data.headers[index].u.wap_16.orig_port & 0xFF00) >> 7; // unsigned short
-                data_buf[length++] =  clientBdData->user_data.headers[index].u.wap_16.orig_port & 0x00FF;
-            break;
-            case RIL_CDMA_SMS_UDH_CONCAT_16:
-#ifdef DBG_LOG_LEVEL_A
-                LOGD("clientBdData->user_data.headers[%d].u.concat_16.msg_ref  = 0x%04x\n", index, clientBdData->user_data.headers[index].u.concat_16.msg_ref);
-                LOGD("clientBdData->user_data.headers[%d].u.concat_16.total_sm = 0x%04x\n", index, clientBdData->user_data.headers[index].u.concat_16.total_sm);
-                LOGD("clientBdData->user_data.headers[%d].u.concat_16.seq_num  = 0x%04x\n", index, clientBdData->user_data.headers[index].u.concat_16.seq_num);
-#endif
-                data_buf[length++] = 4;
-                data_buf[length++] = (clientBdData->user_data.headers[index].u.concat_16.msg_ref & 0xFF00) >> 7; // unsigned short
-                data_buf[length++] =  clientBdData->user_data.headers[index].u.concat_16.msg_ref & 0x00FF;
-                data_buf[length++] =  clientBdData->user_data.headers[index].u.concat_16.total_sm;
-                data_buf[length++] =  clientBdData->user_data.headers[index].u.concat_16.seq_num;
-            break;
-            default:
-            break;
-        }
-    }
-
-    if (length != 0) {
-        arrData = env->NewByteArray((jsize)length);
-        env->SetByteArrayRegion(arrData, 0, length, data_buf);
-    }
-
-    return arrData;
-}
-
-
-/* native interface */
-JNIEXPORT jint JNICALL
-Java_com_android_internal_telephony_cdma_sms_SmsDataCoding_nativeCdmaSmsSetSmsAddress
-  (JNIEnv * env, jobject obj, jobject smsAddress)
-{
-    jclass SmsAddressClass;
-    jfieldID field;
-    jbyteArray arrData = NULL;
-    jbyte byte_buf[RIL_CDMA_SMS_ADDRESS_MAX];
-    int length;
-    jint intData;
-    jbyte byteData;
-    jboolean booleanData;
-
-#ifdef DBG_LOG_LEVEL_B
-    LOGD("nativeCdmaSmsSetSmsAddress()...\n");
-#endif
-
-    // callback.digit_mode
-    if (getObjectByteField(env, smsAddress, "digitMode", &byteData) != JNI_SUCCESS)
-        return JNI_FAILURE;
-    clientBdData->callback.digit_mode = (RIL_CDMA_SMS_DigitMode)(byteData);
-#ifdef DBG_LOG_LEVEL_A
-    LOGD("clientBdData->callback.digit_mode = 0x%02x\n", clientBdData->callback.digit_mode);
-#endif
-
-    // callback.number_mode
-    if (getObjectByteField(env, smsAddress, "numberMode", &byteData) != JNI_SUCCESS)
-        return JNI_FAILURE;
-    clientBdData->callback.number_mode = (RIL_CDMA_SMS_NumberMode)(byteData);
-#ifdef DBG_LOG_LEVEL_A
-    LOGD("clientBdData->callback.number_mode = 0x%02x\n", clientBdData->callback.number_mode);
-#endif
-
-    // callback.number_type
-    if (getObjectIntField(env, smsAddress, "ton", &intData) != JNI_SUCCESS)
-        return JNI_FAILURE;
-    clientBdData->callback.number_type = (RIL_CDMA_SMS_NumberType)(intData);
-#ifdef DBG_LOG_LEVEL_A
-    LOGD("clientBdData->callback.number_type = %d\n", clientBdData->callback.number_type);
-#endif
-
-    // callback.number_plan
-    if (getObjectByteField(env, smsAddress, "numberPlan", &byteData) != JNI_SUCCESS)
-        return JNI_FAILURE;
-    clientBdData->callback.number_plan = (RIL_CDMA_SMS_NumberPlan)(byteData);
-#ifdef DBG_LOG_LEVEL_A
-    LOGD("clientBdData->callback.number_plan = 0x%02x\n", clientBdData->callback.number_plan);
-#endif
-
-    // callback.number_of_digits
-    if (getObjectByteField(env, smsAddress, "numberOfDigits", &byteData) != JNI_SUCCESS)
-        return JNI_FAILURE;
-    clientBdData->callback.number_of_digits = byteData;
-#ifdef DBG_LOG_LEVEL_A
-    LOGD("clientBdData->callback.number_of_digits = %d\n",clientBdData->callback.number_of_digits);
-#endif
-
-    // callback.digits
-    if (getObjectByteArrayField(env, smsAddress, "origBytes", byte_buf, &length) != JNI_SUCCESS)
-        return JNI_FAILURE;
-    for (int i = 0; i < clientBdData->callback.number_of_digits; i++) {
-        clientBdData->callback.digits[i] = byte_buf[i];
-#ifdef DBG_LOG_LEVEL_A
-        LOGD("clientBdData->callback.digits[%d] = 0x%02x\n", i, clientBdData->callback.digits[i]);
-#endif
-    }
-
-    return JNI_SUCCESS;
-}
-
-
-/* native interface */
-JNIEXPORT jint JNICALL
-Java_com_android_internal_telephony_cdma_sms_SmsDataCoding_nativeCdmaSmsGetSmsAddress
-  (JNIEnv * env, jobject obj, jobject smsAddress)
-{
-    jclass SmsAddressClass;
-    jfieldID field;
-    jbyteArray arrData = NULL;
-    jbyte *byte_buf;
-    int length;
-
-#ifdef DBG_LOG_LEVEL_B
-    LOGD("nativeCdmaSmsGetSmsAddress()...\n");
-#endif
-
-    // callback.digit_mode
-#ifdef DBG_LOG_LEVEL_A
-    LOGD("clientBdData->callback.digit_mode = 0x%02x\n", clientBdData->callback.digit_mode);
-#endif
-    if (setObjectByteField(env, smsAddress, "digitMode", (jbyte)clientBdData->callback.digit_mode) != JNI_SUCCESS)
-        return JNI_FAILURE;
-
-    // callback.number_mode
-#ifdef DBG_LOG_LEVEL_A
-    LOGD("clientBdData->callback.number_mode = 0x%02x\n", clientBdData->callback.number_mode);
-#endif
-    if (setObjectByteField(env, smsAddress, "numberMode", (jbyte)clientBdData->callback.number_mode) != JNI_SUCCESS)
-        return JNI_FAILURE;
-
-    // callback.number_type
-#ifdef DBG_LOG_LEVEL_A
-    LOGD("clientBdData->callback.number_type = %d\n", clientBdData->callback.number_type);
-#endif
-    if (setObjectIntField(env, smsAddress, "ton", (jint)clientBdData->callback.number_type) != JNI_SUCCESS)
-        return JNI_FAILURE;
-
-    // callback.number_plan
-#ifdef DBG_LOG_LEVEL_A
-    LOGD("clientBdData->callback.number_plan = 0x%02x\n", clientBdData->callback.number_plan);
-#endif
-    if (setObjectByteField(env, smsAddress, "numberPlan", (jbyte)clientBdData->callback.number_plan) != JNI_SUCCESS)
-        return JNI_FAILURE;
-
-    // callback.number_of_digits
-#ifdef DBG_LOG_LEVEL_A
-    LOGD("clientBdData->callback.number_of_digits = %d\n", clientBdData->callback.number_of_digits);
-#endif
-    if (setObjectByteField(env, smsAddress, "numberOfDigits", (jbyte)clientBdData->callback.number_of_digits) != JNI_SUCCESS)
-        return JNI_FAILURE;
-
-    // callback.digits
-    byte_buf = (jbyte*)clientBdData->callback.digits;
-    length = clientBdData->callback.number_of_digits;
-#ifdef DBG_LOG_LEVEL_A
-    for (int i = 0; i < length; i++) {
-        LOGD("clientBdData->callback.digits[%d] = 0x%02x\n", i, clientBdData->callback.digits[i]);
-    }
-#endif
-
-    if (setObjectByteArrayField(env, smsAddress, "origBytes", byte_buf, length) != JNI_SUCCESS)
-        return JNI_FAILURE;
-
-    return JNI_SUCCESS;
-}
-
-
-/* native interface */
-JNIEXPORT jbyteArray JNICALL
-Java_com_android_internal_telephony_cdma_sms_SmsDataCoding_nativeCdmaSmsEncodeSms
-  (JNIEnv * env, jobject obj)
-{
-    RIL_CDMA_Encoded_SMS *encoded_sms = (RIL_CDMA_Encoded_SMS *)malloc(sizeof(RIL_CDMA_Encoded_SMS));
-    jbyte* data_buf;
-    jint result = JNI_SUCCESS;
-    jbyteArray encodedSMS;
-
-#ifdef DBG_LOG_LEVEL_B
-    LOGD("nativeCdmaSmsEncodeSms(): entry\n");
-#endif
-
-    if (NULL == encoded_sms) {
-        jniThrowException(env, "java/lang/NullPointerException", "encoded_sms is null");
-        return NULL;
-    }
-    memset(encoded_sms, 0, sizeof(RIL_CDMA_Encoded_SMS));
-
-    // call CDMA SMS encode function
-    if(wmsts_ril_cdma_encode_sms(clientBdData, encoded_sms) != RIL_E_SUCCESS) {
-        jniThrowException(env, "java/lang/Exception", "CDMA SMS Encoding failed");
-        return NULL;
-    }
-
-#ifdef DBG_LOG_LEVEL_A
-    LOGD("  EncodeSMS: length = %i\n", encoded_sms->length);
-#endif
-    encodedSMS = env->NewByteArray((jsize)encoded_sms->length);
-    env->SetByteArrayRegion(encodedSMS, 0, encoded_sms->length, (jbyte*)encoded_sms->data);
-    free(encoded_sms);
-
-    return encodedSMS;
-}
-
-
-/* native interface */
-JNIEXPORT jint JNICALL
-Java_com_android_internal_telephony_cdma_sms_SmsDataCoding_nativeCdmaSmsDecodeSms
-  (JNIEnv * env, jobject obj, jbyteArray encodedSMS)
-{
-    RIL_CDMA_Encoded_SMS *encoded_sms = (RIL_CDMA_Encoded_SMS *)malloc(sizeof(RIL_CDMA_Encoded_SMS));
-    jbyte* data_buf;
-    jint result = JNI_SUCCESS;
-    jsize length;
-
-#ifdef DBG_LOG_LEVEL_B
-    LOGD("nativeCdmaSmsDecodeSms(): entry\n");
-#endif
-
-    if (NULL == encoded_sms) {
-        jniThrowException(env, "java/lang/NullPointerException", "encoded_sms is null");
-        return JNI_FAILURE;
-    }
-    memset(encoded_sms, 0, sizeof(RIL_CDMA_Encoded_SMS));
-
-    length = env->GetArrayLength(encodedSMS);
-    if (length < 0 || length > 255) {
-        jniThrowException(env, "java/lang/ArrayIndexOutOfBounds", "wrong encoded SMS data length");
-        return JNI_FAILURE;
-    }
-    encoded_sms->length = length;
-#ifdef DBG_LOG_LEVEL_A
-    LOGD("  DecodeSMS: arrayLength = %d\n", encoded_sms->length);
-#endif
-    data_buf = env->GetByteArrayElements(encodedSMS, NULL);
-    encoded_sms->data = (unsigned char*)data_buf;
-    env->ReleaseByteArrayElements(encodedSMS, data_buf, 0);
-
-    // call CDMA SMS decode function
-    if(wmsts_ril_cdma_decode_sms(encoded_sms, clientBdData) != RIL_E_SUCCESS) {
-        jniThrowException(env, "java/lang/Exception", "CDMA SMS Decoding failed");
-        result = JNI_FAILURE;
-    }
-
-    free(encoded_sms);
-
-    return result;
-}
-
-
-// ---------------------------------------------------------------------------
-
-static const char *classPathName = "com/android/internal/telephony/cdma/sms/SmsDataCoding";
-
-static JNINativeMethod methods[] = {
-    /* name, signature, funcPtr */
-    {"nativeCdmaSmsConstructClientBD", "()I",
-      (void*)Java_com_android_internal_telephony_cdma_sms_SmsDataCoding_nativeCdmaSmsConstructClientBD },
-    {"nativeCdmaSmsDestructClientBD", "()I",
-      (void*)Java_com_android_internal_telephony_cdma_sms_SmsDataCoding_nativeCdmaSmsDestructClientBD },
-    {"nativeCdmaSmsSetBearerDataPrimitives", "(Lcom/android/internal/telephony/cdma/sms/BearerData;)I",
-      (void*)Java_com_android_internal_telephony_cdma_sms_SmsDataCoding_nativeCdmaSmsSetBearerDataPrimitives },
-    {"nativeCdmaSmsGetBearerDataPrimitives", "(Lcom/android/internal/telephony/cdma/sms/BearerData;)I",
-      (void*)Java_com_android_internal_telephony_cdma_sms_SmsDataCoding_nativeCdmaSmsGetBearerDataPrimitives },
-    {"nativeCdmaSmsSetUserData", "(Lcom/android/internal/telephony/cdma/sms/UserData;)I",
-      (void*)Java_com_android_internal_telephony_cdma_sms_SmsDataCoding_nativeCdmaSmsSetUserData },
-    {"nativeCdmaSmsGetUserData", "(Lcom/android/internal/telephony/cdma/sms/UserData;)I",
-      (void*)Java_com_android_internal_telephony_cdma_sms_SmsDataCoding_nativeCdmaSmsGetUserData },
-    {"nativeCdmaSmsSetUserDataHeader", "(I[BII)I",
-      (void*)Java_com_android_internal_telephony_cdma_sms_SmsDataCoding_nativeCdmaSmsSetUserDataHeader },
-    {"nativeCdmaSmsGetUserDataHeader", "()[B",
-      (void*)Java_com_android_internal_telephony_cdma_sms_SmsDataCoding_nativeCdmaSmsGetUserDataHeader },
-    {"nativeCdmaSmsSetSmsAddress", "(Lcom/android/internal/telephony/cdma/sms/CdmaSmsAddress;)I",
-      (void*)Java_com_android_internal_telephony_cdma_sms_SmsDataCoding_nativeCdmaSmsSetSmsAddress },
-    {"nativeCdmaSmsGetSmsAddress", "(Lcom/android/internal/telephony/cdma/sms/CdmaSmsAddress;)I",
-      (void*)Java_com_android_internal_telephony_cdma_sms_SmsDataCoding_nativeCdmaSmsGetSmsAddress },
-    {"nativeCdmaSmsEncodeSms", "()[B",
-      (void*)Java_com_android_internal_telephony_cdma_sms_SmsDataCoding_nativeCdmaSmsEncodeSms },
-    {"nativeCdmaSmsDecodeSms", "([B)I",
-      (void*)Java_com_android_internal_telephony_cdma_sms_SmsDataCoding_nativeCdmaSmsDecodeSms },
-};
-
-int register_android_cdma_sms_methods(JNIEnv *_env)
-{
-    return android::AndroidRuntime::registerNativeMethods(
-            _env, classPathName, methods, NELEM(methods));
-}
-
-// ---------------------------------------------------------------------------
-
-jint JNI_OnLoad(JavaVM* vm, void* reserved)
-{
-    JNIEnv* env = NULL;
-    jint result = -1;
-
-    if (vm->GetEnv((void**) &env, JNI_VERSION_1_4) != JNI_OK) {
-        LOGE("ERROR: GetEnv failed\n");
-        goto bail;
-    }
-    assert(env != NULL);
-
-    if (register_android_cdma_sms_methods(env) < 0) {
-        LOGE("ERROR: CDMA SMS native registration failed\n");
-        goto bail;
-    }
-
-    /* success -- return valid version number */
-    result = JNI_VERSION_1_4;
-
-bail:
-    return result;
-}
diff --git a/telephony/jni/cdmasms/cdma_sms_jni.h b/telephony/jni/cdmasms/cdma_sms_jni.h
deleted file mode 100644
index 253c006cd9a5..000000000000
--- a/telephony/jni/cdmasms/cdma_sms_jni.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class com_android_internal_telephony_cdma_sms_SmsDataCoding */
-
-#ifndef _Included_com_android_internal_telephony_cdma_sms_SmsDataCoding
-#define _Included_com_android_internal_telephony_cdma_sms_SmsDataCoding
-#ifdef __cplusplus
-extern "C" {
-#endif
-#undef com_android_internal_telephony_cdma_sms_SmsDataCoding_CDMA_SMS_WMS_MASK_BD_NULL
-#define com_android_internal_telephony_cdma_sms_SmsDataCoding_CDMA_SMS_WMS_MASK_BD_NULL 0L
-#undef com_android_internal_telephony_cdma_sms_SmsDataCoding_CDMA_SMS_WMS_MASK_BD_MSG_ID
-#define com_android_internal_telephony_cdma_sms_SmsDataCoding_CDMA_SMS_WMS_MASK_BD_MSG_ID 1L
-#undef com_android_internal_telephony_cdma_sms_SmsDataCoding_CDMA_SMS_WMS_MASK_BD_USER_DATA
-#define com_android_internal_telephony_cdma_sms_SmsDataCoding_CDMA_SMS_WMS_MASK_BD_USER_DATA 2L
-#undef com_android_internal_telephony_cdma_sms_SmsDataCoding_CDMA_SMS_WMS_MASK_BD_MC_TIME
-#define com_android_internal_telephony_cdma_sms_SmsDataCoding_CDMA_SMS_WMS_MASK_BD_MC_TIME 8L
-#undef com_android_internal_telephony_cdma_sms_SmsDataCoding_CDMA_SMS_WMS_MASK_BD_NUM_OF_MSGS
-#define com_android_internal_telephony_cdma_sms_SmsDataCoding_CDMA_SMS_WMS_MASK_BD_NUM_OF_MSGS 2048L
-#undef com_android_internal_telephony_cdma_sms_SmsDataCoding_CDMA_SMS_WMS_MASK_BD_CALLBACK
-#define com_android_internal_telephony_cdma_sms_SmsDataCoding_CDMA_SMS_WMS_MASK_BD_CALLBACK 16384L
-#undef com_android_internal_telephony_cdma_sms_SmsDataCoding_CDMA_SMS_WMS_MASK_BD_DISPLAY_MODE
-#define com_android_internal_telephony_cdma_sms_SmsDataCoding_CDMA_SMS_WMS_MASK_BD_DISPLAY_MODE 32768L
-#undef com_android_internal_telephony_cdma_sms_SmsDataCoding_JNI_CDMA_SMS_SUCCESS
-#define com_android_internal_telephony_cdma_sms_SmsDataCoding_JNI_CDMA_SMS_SUCCESS 0L
-#undef com_android_internal_telephony_cdma_sms_SmsDataCoding_JNI_CDMA_SMS_FAILURE
-#define com_android_internal_telephony_cdma_sms_SmsDataCoding_JNI_CDMA_SMS_FAILURE 1L
-#undef com_android_internal_telephony_cdma_sms_SmsDataCoding_JNI_CDMA_SMS_DATA_LEN_OUT_OF_RANGE
-#define com_android_internal_telephony_cdma_sms_SmsDataCoding_JNI_CDMA_SMS_DATA_LEN_OUT_OF_RANGE 2L
-#undef com_android_internal_telephony_cdma_sms_SmsDataCoding_JNI_CDMA_SMS_CLASS_UNKNOWN
-#define com_android_internal_telephony_cdma_sms_SmsDataCoding_JNI_CDMA_SMS_CLASS_UNKNOWN 3L
-#undef com_android_internal_telephony_cdma_sms_SmsDataCoding_JNI_CDMA_SMS_FIELD_ID_UNKNOWN
-#define com_android_internal_telephony_cdma_sms_SmsDataCoding_JNI_CDMA_SMS_FIELD_ID_UNKNOWN 4L
-#undef com_android_internal_telephony_cdma_sms_SmsDataCoding_JNI_CDMA_SMS_OUT_OF_MEMORY
-#define com_android_internal_telephony_cdma_sms_SmsDataCoding_JNI_CDMA_SMS_OUT_OF_MEMORY 5L
-/*
- * Class:     com_android_internal_telephony_cdma_sms_SmsDataCoding
- * Method:    nativeCdmaSmsConstructClientBD
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_com_android_internal_telephony_cdma_sms_SmsDataCoding_nativeCdmaSmsConstructClientBD
-  (JNIEnv *, jobject);
-
-/*
- * Class:     com_android_internal_telephony_cdma_sms_SmsDataCoding
- * Method:    nativeCdmaSmsDestructClientBD
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_com_android_internal_telephony_cdma_sms_SmsDataCoding_nativeCdmaSmsDestructClientBD
-  (JNIEnv *, jobject);
-
-/*
- * Class:     com_android_internal_telephony_cdma_sms_SmsDataCoding
- * Method:    nativeCdmaSmsSetBearerDataPrimitives
- * Signature: (Lcom/android/internal/telephony/cdma/sms/BearerData;)I
- */
-JNIEXPORT jint JNICALL Java_com_android_internal_telephony_cdma_sms_SmsDataCoding_nativeCdmaSmsSetBearerDataPrimitives
-  (JNIEnv *, jobject, jobject);
-
-/*
- * Class:     com_android_internal_telephony_cdma_sms_SmsDataCoding
- * Method:    nativeCdmaSmsGetBearerDataPrimitives
- * Signature: (Lcom/android/internal/telephony/cdma/sms/BearerData;)I
- */
-JNIEXPORT jint JNICALL Java_com_android_internal_telephony_cdma_sms_SmsDataCoding_nativeCdmaSmsGetBearerDataPrimitives
-  (JNIEnv *, jobject, jobject);
-
-/*
- * Class:     com_android_internal_telephony_cdma_sms_SmsDataCoding
- * Method:    nativeCdmaSmsSetUserData
- * Signature: (Lcom/android/internal/telephony/cdma/sms/UserData;)I
- */
-JNIEXPORT jint JNICALL Java_com_android_internal_telephony_cdma_sms_SmsDataCoding_nativeCdmaSmsSetUserData
-  (JNIEnv *, jobject, jobject);
-
-/*
- * Class:     com_android_internal_telephony_cdma_sms_SmsDataCoding
- * Method:    nativeCdmaSmsGetUserData
- * Signature: (Lcom/android/internal/telephony/cdma/sms/UserData;)I
- */
-JNIEXPORT jint JNICALL Java_com_android_internal_telephony_cdma_sms_SmsDataCoding_nativeCdmaSmsGetUserData
-  (JNIEnv *, jobject, jobject);
-
-/*
- * Class:     com_android_internal_telephony_cdma_sms_SmsDataCoding
- * Method:    nativeCdmaSmsSetUserDataHeader
- * Signature: (I[BII)I
- */
-JNIEXPORT jint JNICALL Java_com_android_internal_telephony_cdma_sms_SmsDataCoding_nativeCdmaSmsSetUserDataHeader
-  (JNIEnv *, jobject, jint, jbyteArray, jint, jint);
-
-/*
- * Class:     com_android_internal_telephony_cdma_sms_SmsDataCoding
- * Method:    nativeCdmaSmsGetUserDataHeader
- * Signature: ()[B
- */
-JNIEXPORT jbyteArray JNICALL Java_com_android_internal_telephony_cdma_sms_SmsDataCoding_nativeCdmaSmsGetUserDataHeader
-  (JNIEnv *, jobject);
-
-/*
- * Class:     com_android_internal_telephony_cdma_sms_SmsDataCoding
- * Method:    nativeCdmaSmsSetSmsAddress
- * Signature: (Lcom/android/internal/telephony/cdma/sms/CdmaSmsAddress;)I
- */
-JNIEXPORT jint JNICALL Java_com_android_internal_telephony_cdma_sms_SmsDataCoding_nativeCdmaSmsSetSmsAddress
-  (JNIEnv *, jobject, jobject);
-
-/*
- * Class:     com_android_internal_telephony_cdma_sms_SmsDataCoding
- * Method:    nativeCdmaSmsGetSmsAddress
- * Signature: (Lcom/android/internal/telephony/cdma/sms/CdmaSmsAddress;)I
- */
-JNIEXPORT jint JNICALL Java_com_android_internal_telephony_cdma_sms_SmsDataCoding_nativeCdmaSmsGetSmsAddress
-  (JNIEnv *, jobject, jobject);
-
-/*
- * Class:     com_android_internal_telephony_cdma_sms_SmsDataCoding
- * Method:    nativeCdmaSmsEncodeSms
- * Signature: ()[B
- */
-JNIEXPORT jbyteArray JNICALL Java_com_android_internal_telephony_cdma_sms_SmsDataCoding_nativeCdmaSmsEncodeSms
-  (JNIEnv *, jobject);
-
-/*
- * Class:     com_android_internal_telephony_cdma_sms_SmsDataCoding
- * Method:    nativeCdmaSmsDecodeSms
- * Signature: ([B)I
- */
-JNIEXPORT jint JNICALL Java_com_android_internal_telephony_cdma_sms_SmsDataCoding_nativeCdmaSmsDecodeSms
-  (JNIEnv *, jobject, jbyteArray);
-
-/**
- * CDMA SMS return value defines
- */
-#define JNI_SUCCESS \
-com_android_internal_telephony_cdma_sms_SmsDataCoding_JNI_CDMA_SMS_SUCCESS  /**< Successful operation */
-#define JNI_FAILURE \
-com_android_internal_telephony_cdma_sms_SmsDataCoding_JNI_CDMA_SMS_FAILURE  /**< General failure */
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/test-runner/android/test/ActivityInstrumentationTestCase.java b/test-runner/android/test/ActivityInstrumentationTestCase.java
index e5a9991ae557..f6b31ad208f7 100644
--- a/test-runner/android/test/ActivityInstrumentationTestCase.java
+++ b/test-runner/android/test/ActivityInstrumentationTestCase.java
@@ -40,7 +40,11 @@ public abstract class ActivityInstrumentationTestCase<T extends Activity>
     boolean mInitialTouchMode = false;
 
     /**
-     * @param pkg The package of the instrumentation.
+     * <b>NOTE:</b> The parameter <i>pkg</i> must refer to the package identifier of the
+     * package hosting the activity to be launched, which is specified in the AndroidManifest.xml
+     * file.  This is not necessarily the same as the java package name.
+     * 
+     * @param pkg The package hosting the activity to be launched.
      * @param activityClass The activity to test.
      */
     public ActivityInstrumentationTestCase(String pkg, Class<T> activityClass) {
@@ -48,7 +52,11 @@ public abstract class ActivityInstrumentationTestCase<T extends Activity>
     }
 
     /**
-     * @param pkg The package of the instrumentation.
+     * <b>NOTE:</b> The parameter <i>pkg</i> must refer to the package identifier of the
+     * package hosting the activity to be launched, which is specified in the AndroidManifest.xml
+     * file.  This is not necessarily the same as the java package name.
+     * 
+     * @param pkg The package hosting the activity to be launched.
      * @param activityClass The activity to test.
      * @param initialTouchMode true = in touch mode
      */
diff --git a/test-runner/android/test/ActivityInstrumentationTestCase2.java b/test-runner/android/test/ActivityInstrumentationTestCase2.java
index 7a84ecae7b38..679f6346537b 100644
--- a/test-runner/android/test/ActivityInstrumentationTestCase2.java
+++ b/test-runner/android/test/ActivityInstrumentationTestCase2.java
@@ -46,7 +46,11 @@ public abstract class ActivityInstrumentationTestCase2<T extends Activity>
     Intent mActivityIntent = null;
 
     /**
-     * @param pkg The package of the instrumentation.
+     * <b>NOTE:</b> The parameter <i>pkg</i> must refer to the package identifier of the
+     * package hosting the activity to be launched, which is specified in the AndroidManifest.xml
+     * file.  This is not necessarily the same as the java package name.
+     * 
+     * @param pkg The package hosting the activity to be launched.
      * @param activityClass The activity to test.
      */
     public ActivityInstrumentationTestCase2(String pkg, Class<T> activityClass) {
diff --git a/test-runner/android/test/InstrumentationCoreTestRunner.java b/test-runner/android/test/InstrumentationCoreTestRunner.java
index 6b1a4e44d71b..3f77a60732bc 100644
--- a/test-runner/android/test/InstrumentationCoreTestRunner.java
+++ b/test-runner/android/test/InstrumentationCoreTestRunner.java
@@ -17,27 +17,158 @@
 package android.test;
 
 import java.io.File;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.List;
 
+import com.android.internal.util.Predicate;
+import com.android.internal.util.Predicates;
+
+import dalvik.annotation.BrokenTest;
+import dalvik.annotation.SideEffect;
+
+import junit.framework.AssertionFailedError;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestListener;
 import android.os.Bundle;
+import android.test.suitebuilder.TestMethod;
+import android.test.suitebuilder.annotation.HasAnnotation;
+import android.util.Log;
 
 /**
  * This test runner extends the default InstrumentationTestRunner. It overrides
  * the {@code onCreate(Bundle)} method and sets the system properties necessary
  * for many core tests to run. This is needed because there are some core tests
- * that need writing access to the filesystem.
+ * that need writing access to the file system. We also need to set the harness
+ * Thread's context ClassLoader. Otherwise some classes and resources will not
+ * be found. Finally, we add a means to free memory allocated by a TestCase
+ * after its execution.
  *
  * @hide
  */
 public class InstrumentationCoreTestRunner extends InstrumentationTestRunner {
 
+    private static final String TAG = "InstrumentationCoreTestRunner";
+    private boolean singleTest = false;
+    
     @Override
     public void onCreate(Bundle arguments) {
-        super.onCreate(arguments);
-        
+        // We might want to move this to /sdcard, if is is mounted/writable.
         File cacheDir = getTargetContext().getCacheDir();
 
         System.setProperty("user.language", "en");
         System.setProperty("user.region", "US");
+        
+        System.setProperty("java.home", cacheDir.getAbsolutePath());
+        System.setProperty("user.home", cacheDir.getAbsolutePath());
         System.setProperty("java.io.tmpdir", cacheDir.getAbsolutePath());
+        System.setProperty("javax.net.ssl.trustStore",
+                "/etc/security/cacerts.bks");
+        
+        if (arguments != null) {
+            String classArg = arguments.getString(ARGUMENT_TEST_CLASS);
+            singleTest = classArg != null && classArg.contains("#"); 
+        }
+        
+        super.onCreate(arguments);
+    }
+
+    protected AndroidTestRunner getAndroidTestRunner() {
+        AndroidTestRunner runner = super.getAndroidTestRunner();
+
+        runner.addTestListener(new TestListener() {
+            private Class<?> lastClass;
+            
+            public void startTest(Test test) {
+                if (test.getClass() != lastClass) {
+                    printMemory(test.getClass());
+                }
+                
+                Thread.currentThread().setContextClassLoader(
+                        test.getClass().getClassLoader());
+            }
+            
+            public void endTest(Test test) {
+                if (test instanceof TestCase) {
+                    if (lastClass == null) {
+                        lastClass = test.getClass();
+                    } else {
+                        if (test.getClass() != lastClass) {
+                            cleanup(lastClass);
+                            lastClass = test.getClass();
+                        }
+                    }
+                }
+            }
+            
+            public void addError(Test test, Throwable t) {
+            }
+            
+            public void addFailure(Test test, AssertionFailedError t) {
+            }
+            
+            /**
+             * Dumps some memory info.
+             */
+            private void printMemory(Class<? extends Test> testClass) {
+                Runtime runtime = Runtime.getRuntime();
+
+                long total = runtime.totalMemory();
+                long free = runtime.freeMemory();
+                long used = total - free;
+                
+                Log.d(TAG, "Total memory  : " + total);
+                Log.d(TAG, "Used memory   : " + used);
+                Log.d(TAG, "Free memory   : " + free);
+                Log.d(TAG, "Now executing : " + testClass.getName());
+            }
+
+            /**
+             * Nulls all static reference fields in the given test class. This
+             * method helps us with those test classes that don't have an
+             * explicit tearDown() method. Normally the garbage collector should
+             * take care of everything, but since JUnit keeps references to all
+             * test cases, a little help might be a good idea.
+             */
+            private void cleanup(Class<?> clazz) {
+                if (clazz != TestCase.class) {
+                    Field[] fields = clazz.getDeclaredFields();
+                    for (int i = 0; i < fields.length; i++) {
+                        Field f = fields[i];
+                        if (!f.getType().isPrimitive() &&
+                                Modifier.isStatic(f.getModifiers())) {
+                            try {
+                                f.setAccessible(true);
+                                f.set(null, null);
+                            } catch (Exception ignored) {
+                                // Nothing we can do about it.
+                            }
+                        }
+                    }
+                    
+                    // don't cleanup the superclass for now
+                    //cleanup(clazz.getSuperclass());
+                }
+            }
+            
+        });
+        
+        return runner;
+    }    
+
+    @Override
+    List<Predicate<TestMethod>> getBuilderRequirements() {
+        List<Predicate<TestMethod>> builderRequirements =
+                super.getBuilderRequirements();
+        Predicate<TestMethod> brokenTestPredicate =
+                Predicates.not(new HasAnnotation(BrokenTest.class));
+        builderRequirements.add(brokenTestPredicate);
+        if (!singleTest) {
+            Predicate<TestMethod> sideEffectPredicate =
+                    Predicates.not(new HasAnnotation(SideEffect.class));
+            builderRequirements.add(sideEffectPredicate);
+        }
+        return builderRequirements;
     }
 }
diff --git a/test-runner/android/test/InstrumentationTestRunner.java b/test-runner/android/test/InstrumentationTestRunner.java
index 044f55581a3d..d5e64596c731 100644
--- a/test-runner/android/test/InstrumentationTestRunner.java
+++ b/test-runner/android/test/InstrumentationTestRunner.java
@@ -43,6 +43,8 @@ import java.io.File;
 import java.io.PrintStream;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
 
 
 /**
@@ -315,6 +317,8 @@ public class InstrumentationTestRunner extends Instrumentation implements TestSu
         } else {
             parseTestClasses(testClassesArg, testSuiteBuilder);
         }
+        
+        testSuiteBuilder.addRequirements(getBuilderRequirements());
 
         mTestRunner = getAndroidTestRunner();
         mTestRunner.setContext(getTargetContext());
@@ -331,6 +335,10 @@ public class InstrumentationTestRunner extends Instrumentation implements TestSu
         start();
     }
 
+    List<Predicate<TestMethod>> getBuilderRequirements() {
+        return new ArrayList<Predicate<TestMethod>>();
+    }
+
     /**
      * Parses and loads the specified set of test classes 
      * @param testClassArg - comma-separated list of test classes and methods
diff --git a/test-runner/android/test/SingleLaunchActivityTestCase.java b/test-runner/android/test/SingleLaunchActivityTestCase.java
index 8d43b732cf85..b63b3ce19759 100644
--- a/test-runner/android/test/SingleLaunchActivityTestCase.java
+++ b/test-runner/android/test/SingleLaunchActivityTestCase.java
@@ -37,7 +37,11 @@ public abstract class SingleLaunchActivityTestCase<T extends Activity>
     private static boolean sActivityLaunchedFlag = false;
 
     /**
-     * @param pkg The package of the instrumentation.
+     * <b>NOTE:</b> The parameter <i>pkg</i> must refer to the package identifier of the
+     * package hosting the activity to be launched, which is specified in the AndroidManifest.xml
+     * file.  This is not necessarily the same as the java package name.
+     *
+     * @param pkg The package hosting the activity to be launched.
      * @param activityClass The activity to test.
      */
     public SingleLaunchActivityTestCase(String pkg, Class<T> activityClass) {
diff --git a/test-runner/android/test/SyncBaseInstrumentation.java b/test-runner/android/test/SyncBaseInstrumentation.java
index c1d2507dce6c..0b4bfed3e9cc 100644
--- a/test-runner/android/test/SyncBaseInstrumentation.java
+++ b/test-runner/android/test/SyncBaseInstrumentation.java
@@ -23,6 +23,8 @@ import android.os.Bundle;
 import android.os.SystemClock;
 import android.provider.Sync;
 import android.net.Uri;
+import android.accounts.Account;
+
 import java.util.Map;
 
 /**
@@ -49,7 +51,8 @@ public class SyncBaseInstrumentation extends InstrumentationTestCase {
     protected void syncProvider(Uri uri, String account, String authority) throws Exception {
         Bundle extras = new Bundle();
         extras.putBoolean(ContentResolver.SYNC_EXTRAS_FORCE, true);
-        extras.putString(ContentResolver.SYNC_EXTRAS_ACCOUNT, account);
+        Account account1 = new Account(account, "com.google.GAIA");
+        extras.putParcelable(ContentResolver.SYNC_EXTRAS_ACCOUNT, account1);
 
         mContentResolver.startSync(uri, extras);
         long startTimeInMillis = SystemClock.elapsedRealtime();
@@ -66,7 +69,7 @@ public class SyncBaseInstrumentation extends InstrumentationTestCase {
                 break;
             }
 
-            if (isSyncActive(account, authority)) {
+            if (isSyncActive(account1, authority)) {
                 counter = 0;
                 continue;
             }
@@ -87,7 +90,7 @@ public class SyncBaseInstrumentation extends InstrumentationTestCase {
      * entry is in either the Pending or Active tables.
      * @return
      */
-    private boolean isSyncActive(String account, String authority) {
+    private boolean isSyncActive(Account account, String authority) {
         Sync.Pending.QueryMap pendingQueryMap = null;
         Sync.Active.QueryMap activeQueryMap = null;
         try {
@@ -107,11 +110,12 @@ public class SyncBaseInstrumentation extends InstrumentationTestCase {
         }
     }
 
-    private boolean isActiveInActiveQueryMap(Sync.Active.QueryMap activemap, String account,
+    private boolean isActiveInActiveQueryMap(Sync.Active.QueryMap activemap, Account account,
                                              String authority) {
         Map<String, ContentValues> rows = activemap.getRows();
         for (ContentValues values : rows.values()) {
-            if (values.getAsString("account").equals(account)
+            if (values.getAsString("account").equals(account.mName)
+                    && values.getAsString("account_type").equals(account.mType)
                     && values.getAsString("authority").equals(authority)) {
                 return true;
             }
diff --git a/tests/AndroidTests/src/com/android/unit_tests/BitwiseStreamsTest.java b/tests/AndroidTests/src/com/android/unit_tests/BitwiseStreamsTest.java
new file mode 100644
index 000000000000..a93524776d21
--- /dev/null
+++ b/tests/AndroidTests/src/com/android/unit_tests/BitwiseStreamsTest.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright (C) 2006 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.unit_tests;
+
+import com.android.internal.util.BitwiseInputStream;
+import com.android.internal.util.BitwiseOutputStream;
+import com.android.internal.util.HexDump;
+
+import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.SmallTest;
+
+import android.util.Log;
+
+public class BitwiseStreamsTest extends AndroidTestCase {
+    private final static String LOG_TAG = "BitwiseStreamsTest";
+
+    @SmallTest
+    public void testOne() throws Exception {
+        int offset = 3;
+        byte[] inBuf = HexDump.hexStringToByteArray("FFDD");
+        BitwiseOutputStream outStream = new BitwiseOutputStream(30);
+        outStream.skip(offset);
+        for (int i = 0; i < inBuf.length; i++) outStream.write(8, inBuf[i]);
+        byte[] outBuf = outStream.toByteArray();
+        BitwiseInputStream inStream = new BitwiseInputStream(outBuf);
+        byte[] inBufDup = new byte[inBuf.length];
+        inStream.skip(offset);
+        for (int i = 0; i < inBufDup.length; i++) inBufDup[i] = inStream.read(8);
+        assertEquals(HexDump.toHexString(inBuf), HexDump.toHexString(inBufDup));
+    }
+
+    @SmallTest
+    public void testTwo() throws Exception {
+        int offset = 3;
+        byte[] inBuf = HexDump.hexStringToByteArray("11d4f29c0e9ad3c36e72584e064d9b53");
+        BitwiseOutputStream outStream = new BitwiseOutputStream(30);
+        outStream.skip(offset);
+        for (int i = 0; i < inBuf.length; i++) outStream.write(8, inBuf[i]);
+        BitwiseInputStream inStream = new BitwiseInputStream(outStream.toByteArray());
+        inStream.skip(offset);
+        byte[] inBufDup = new byte[inBuf.length];
+        for (int i = 0; i < inBufDup.length; i++) inBufDup[i] = inStream.read(8);
+        assertEquals(HexDump.toHexString(inBuf), HexDump.toHexString(inBufDup));
+    }
+
+    @SmallTest
+    public void testThree() throws Exception {
+        int offset = 4;
+        byte[] inBuf = HexDump.hexStringToByteArray("00031040900112488ea794e0");
+        BitwiseOutputStream outStream = new BitwiseOutputStream(30);
+        outStream.skip(offset);
+        for (int i = 0; i < inBuf.length; i++) outStream.write(8, inBuf[i]);
+        BitwiseInputStream inStream = new BitwiseInputStream(outStream.toByteArray());
+        inStream.skip(offset);
+        byte[] inBufDup = new byte[inBuf.length];
+        for (int i = 0; i < inBufDup.length; i++) inBufDup[i] = inStream.read(8);
+        assertEquals(HexDump.toHexString(inBuf), HexDump.toHexString(inBufDup));
+    }
+
+    @SmallTest
+    public void testFour() throws Exception {
+        int offset = 7;
+        byte[] inBuf = HexDump.hexStringToByteArray("00031040900112488ea794e0");
+        BitwiseOutputStream outStream = new BitwiseOutputStream(30);
+        outStream.skip(offset);
+        for (int i = 0; i < inBuf.length; i++) {
+            outStream.write(5, inBuf[i] >>> 3);
+            outStream.write(3, inBuf[i] & 0x07);
+        }
+        BitwiseInputStream inStream = new BitwiseInputStream(outStream.toByteArray());
+        inStream.skip(offset);
+        byte[] inBufDup = new byte[inBuf.length];
+        for (int i = 0; i < inBufDup.length; i++) inBufDup[i] = inStream.read(8);
+        assertEquals(HexDump.toHexString(inBuf), HexDump.toHexString(inBufDup));
+    }
+
+    @SmallTest
+    public void testFive() throws Exception {
+        int num_runs = 10;
+        long start = android.os.SystemClock.elapsedRealtime();
+        for (int run = 0; run < num_runs; run++) {
+            int offset = run % 8;
+            byte[] inBuf = HexDump.hexStringToByteArray("00031040900112488ea794e0");
+            BitwiseOutputStream outStream = new BitwiseOutputStream(30);
+            outStream.skip(offset);
+            for (int i = 0; i < inBuf.length; i++) {
+                outStream.write(5, inBuf[i] >>> 3);
+                outStream.write(3, inBuf[i] & 0x07);
+            }
+            BitwiseInputStream inStream = new BitwiseInputStream(outStream.toByteArray());
+            inStream.skip(offset);
+            byte[] inBufDup = new byte[inBuf.length];
+            for (int i = 0; i < inBufDup.length; i++) inBufDup[i] = inStream.read(8);
+            assertEquals(HexDump.toHexString(inBuf), HexDump.toHexString(inBufDup));
+        }
+        long end = android.os.SystemClock.elapsedRealtime();
+        Log.d(LOG_TAG, "repeated encode-decode took " + (end - start) + " ms");
+    }
+}
diff --git a/tests/AndroidTests/src/com/android/unit_tests/CdmaSmsTest.java b/tests/AndroidTests/src/com/android/unit_tests/CdmaSmsTest.java
new file mode 100644
index 000000000000..723512c3a765
--- /dev/null
+++ b/tests/AndroidTests/src/com/android/unit_tests/CdmaSmsTest.java
@@ -0,0 +1,273 @@
+/*
+ * Copyright (C) 2006 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.unit_tests;
+
+import com.android.internal.telephony.GsmAlphabet;
+import com.android.internal.telephony.SmsHeader;
+import com.android.internal.telephony.cdma.sms.BearerData;
+import com.android.internal.telephony.cdma.sms.UserData;
+import com.android.internal.telephony.cdma.sms.CdmaSmsAddress;
+import com.android.internal.util.BitwiseInputStream;
+import com.android.internal.util.BitwiseOutputStream;
+import com.android.internal.util.HexDump;
+
+import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.SmallTest;
+
+import java.util.Iterator;
+
+import android.util.Log;
+
+public class CdmaSmsTest extends AndroidTestCase {
+    private final static String LOG_TAG = "Cdma_Sms_Test";
+
+    private static UserData makeUserData(String msg) {
+        UserData userData = new UserData();
+        byte[] payload;
+        try {
+            payload = GsmAlphabet.stringToGsm7BitPacked(msg);
+            userData.payload = new byte[payload.length - 1];
+            for (int i = 0; i < userData.payload.length; i++) userData.payload[i] = payload[i + 1];
+            userData.numFields = payload[0];
+            userData.paddingBits = (userData.payload.length * 8) - (userData.numFields * 7);
+            userData.paddingBits = 0; // XXX this is better, wtf?
+            userData.msgEncoding = UserData.ENCODING_GSM_7BIT_ALPHABET;
+        } catch (com.android.internal.telephony.EncodeException ex) {
+            assertEquals(1, 0);
+        }
+        return userData;
+    }
+
+    @SmallTest
+    public void testStandardSms() throws Exception {
+        String pdu = "00031040900112488ea794e074d69e1b7392c270326cde9e98";
+        BearerData bearerData = BearerData.decode(HexDump.hexStringToByteArray(pdu));
+        assertEquals("Test standard SMS", bearerData.userData.payloadStr);
+    }
+
+    @SmallTest
+    public void testStandardSmsFeedback() throws Exception {
+        BearerData bearerData = new BearerData();
+        bearerData.messageType = BearerData.MESSAGE_TYPE_DELIVER;
+        bearerData.messageId = 0;
+        bearerData.hasUserDataHeader = false;
+        String payloadStr = "Test standard SMS";
+        bearerData.userData = makeUserData(payloadStr);
+        byte []encodedSms = BearerData.encode(bearerData);
+        BearerData revBearerData = BearerData.decode(encodedSms);
+        assertEquals(BearerData.MESSAGE_TYPE_DELIVER, revBearerData.messageType);
+        assertEquals(0, revBearerData.messageId);
+        assertEquals(false, revBearerData.hasUserDataHeader);
+        assertEquals(UserData.ENCODING_GSM_7BIT_ALPHABET, revBearerData.userData.msgEncoding);
+        assertEquals(payloadStr.length(), revBearerData.userData.numFields);
+        assertEquals(payloadStr, revBearerData.userData.payloadStr);
+    }
+
+    @SmallTest
+    public void testAltUserDataFeedback() throws Exception {
+        try {
+            BearerData bearerData = new BearerData();
+            bearerData.messageType = BearerData.MESSAGE_TYPE_DELIVER;
+            bearerData.messageId = 0;
+            bearerData.hasUserDataHeader = false;
+            UserData userData = new UserData();
+            String str1 = "test ascii user data encoding";
+            userData.payload = str1.getBytes("US-ASCII");
+            userData.numFields = str1.length();
+            userData.paddingBits = 0;
+            userData.msgEncoding = UserData.ENCODING_7BIT_ASCII;
+            bearerData.userData = userData;
+            byte []encodedSms = BearerData.encode(bearerData);
+            BearerData revBearerData = BearerData.decode(encodedSms);
+            assertEquals(str1, revBearerData.userData.payloadStr);
+            String str2 = "\u0160u\u1E5B\u0301r\u1ECFg\uD835\uDC1At\u00E9\u4E002\u3042";
+            userData.payload = str2.getBytes("UTF-16");
+            userData.numFields = str2.length() + 1;
+            userData.msgEncoding = UserData.ENCODING_UNICODE_16;
+            encodedSms = BearerData.encode(bearerData);
+            revBearerData = BearerData.decode(encodedSms);
+            assertEquals(str2, revBearerData.userData.payloadStr);
+        } catch (java.io.UnsupportedEncodingException ex) {
+            throw new RuntimeException("user data encoding error");
+        }
+    }
+
+    @SmallTest
+    public void testReplyOption() throws Exception {
+        String pdu1 = "0003104090011648b6a794e0705476bf77bceae934fe5f6d94d87450080a0180";
+        BearerData bd1 = BearerData.decode(HexDump.hexStringToByteArray(pdu1));
+        assertEquals("Test Acknowledgement 1", bd1.userData.payloadStr);
+        assertEquals(true, bd1.userAckReq);
+        assertEquals(false, bd1.deliveryAckReq);
+        assertEquals(false, bd1.readAckReq);
+        assertEquals(false, bd1.reportReq);
+        String pdu2 = "0003104090011648b6a794e0705476bf77bceae934fe5f6d94d87490080a0140";
+        BearerData bd2 = BearerData.decode(HexDump.hexStringToByteArray(pdu2));
+        assertEquals("Test Acknowledgement 2", bd2.userData.payloadStr);
+        assertEquals(false, bd2.userAckReq);
+        assertEquals(true, bd2.deliveryAckReq);
+        assertEquals(false, bd2.readAckReq);
+        assertEquals(false, bd2.reportReq);
+        String pdu3 = "0003104090011648b6a794e0705476bf77bceae934fe5f6d94d874d0080a0120";
+        BearerData bd3 = BearerData.decode(HexDump.hexStringToByteArray(pdu3));
+        assertEquals("Test Acknowledgement 3", bd3.userData.payloadStr);
+        assertEquals(false, bd3.userAckReq);
+        assertEquals(false, bd3.deliveryAckReq);
+        assertEquals(true, bd3.readAckReq);
+        assertEquals(false, bd3.reportReq);
+        String pdu4 = "0003104090011648b6a794e0705476bf77bceae934fe5f6d94d87510080a0110";
+        BearerData bd4 = BearerData.decode(HexDump.hexStringToByteArray(pdu4));
+        assertEquals("Test Acknowledgement 4", bd4.userData.payloadStr);
+        assertEquals(false, bd4.userAckReq);
+        assertEquals(false, bd4.deliveryAckReq);
+        assertEquals(false, bd4.readAckReq);
+        assertEquals(true, bd4.reportReq);
+    }
+
+    @SmallTest
+    public void testReplyOptionFeedback() throws Exception {
+        BearerData bearerData = new BearerData();
+        bearerData.messageType = BearerData.MESSAGE_TYPE_DELIVER;
+        bearerData.messageId = 0;
+        bearerData.hasUserDataHeader = false;
+        bearerData.userData = makeUserData("test reply option");
+        bearerData.userAckReq = true;
+        byte []encodedSms = BearerData.encode(bearerData);
+        BearerData revBearerData = BearerData.decode(encodedSms);
+        assertEquals(true, revBearerData.userAckReq);
+        assertEquals(false, revBearerData.deliveryAckReq);
+        assertEquals(false, revBearerData.readAckReq);
+        assertEquals(false, revBearerData.reportReq);
+        bearerData.userAckReq = false;
+        bearerData.deliveryAckReq = true;
+        encodedSms = BearerData.encode(bearerData);
+        revBearerData = BearerData.decode(encodedSms);
+        assertEquals(false, revBearerData.userAckReq);
+        assertEquals(true, revBearerData.deliveryAckReq);
+        assertEquals(false, revBearerData.readAckReq);
+        assertEquals(false, revBearerData.reportReq);
+        bearerData.deliveryAckReq = false;
+        bearerData.readAckReq = true;
+        encodedSms = BearerData.encode(bearerData);
+        revBearerData = BearerData.decode(encodedSms);
+        assertEquals(false, revBearerData.userAckReq);
+        assertEquals(false, revBearerData.deliveryAckReq);
+        assertEquals(true, revBearerData.readAckReq);
+        assertEquals(false, revBearerData.reportReq);
+        bearerData.readAckReq = false;
+        bearerData.reportReq = true;
+        encodedSms = BearerData.encode(bearerData);
+        revBearerData = BearerData.decode(encodedSms);
+        assertEquals(false, revBearerData.userAckReq);
+        assertEquals(false, revBearerData.deliveryAckReq);
+        assertEquals(false, revBearerData.readAckReq);
+        assertEquals(true, revBearerData.reportReq);
+    }
+
+    @SmallTest
+    public void testNumberOfMessages() throws Exception {
+        String pdu1 = "000310409001124896a794e07595f69f199540ea759a0dc8e00b0163";
+        BearerData bd1 = BearerData.decode(HexDump.hexStringToByteArray(pdu1));
+        assertEquals("Test Voice mail 99", bd1.userData.payloadStr);
+        assertEquals(99, bd1.numberOfMessages);
+        String pdu2 = "00031040900113489ea794e07595f69f199540ea759a0988c0600b0164";
+        BearerData bd2 = BearerData.decode(HexDump.hexStringToByteArray(pdu2));
+        assertEquals("Test Voice mail 100", bd2.userData.payloadStr);
+        assertEquals(100, bd2.numberOfMessages);
+    }
+
+    @SmallTest
+    public void testNumberOfMessagesFeedback() throws Exception {
+        BearerData bearerData = new BearerData();
+        bearerData.messageType = BearerData.MESSAGE_TYPE_DELIVER;
+        bearerData.messageId = 0;
+        bearerData.hasUserDataHeader = false;
+        bearerData.userData = makeUserData("test message count");
+        bearerData.numberOfMessages = 27;
+        byte []encodedSms = BearerData.encode(bearerData);
+        BearerData revBearerData = BearerData.decode(encodedSms);
+        assertEquals(bearerData.numberOfMessages, revBearerData.numberOfMessages);
+    }
+
+    @SmallTest
+    public void testCallbackNum() throws Exception {
+        String pdu1 = "00031040900112488ea794e070d436cb638bc5e035ce2f97900e06910431323334";
+        BearerData bd1 = BearerData.decode(HexDump.hexStringToByteArray(pdu1));
+        assertEquals("Test Callback nbr", bd1.userData.payloadStr);
+        assertEquals(CdmaSmsAddress.DIGIT_MODE_8BIT_CHAR, bd1.callbackNumber.digitMode);
+        assertEquals(CdmaSmsAddress.TON_INTERNATIONAL_OR_IP, bd1.callbackNumber.ton);
+        assertEquals(CdmaSmsAddress.NUMBER_MODE_NOT_DATA_NETWORK, bd1.callbackNumber.numberMode);
+        assertEquals(CdmaSmsAddress.NUMBERING_PLAN_ISDN_TELEPHONY, bd1.callbackNumber.numberPlan);
+        assertEquals("1234", bd1.callbackNumber.address);
+    }
+
+    @SmallTest
+    public void testCallbackNumFeedback() throws Exception {
+        BearerData bearerData = new BearerData();
+        bearerData.messageType = BearerData.MESSAGE_TYPE_DELIVER;
+        bearerData.messageId = 0;
+        bearerData.hasUserDataHeader = false;
+        bearerData.userData = makeUserData("test callback number");
+        CdmaSmsAddress addr = new CdmaSmsAddress();
+        addr.digitMode = CdmaSmsAddress.DIGIT_MODE_8BIT_CHAR;
+        addr.ton = CdmaSmsAddress.TON_NATIONAL_OR_EMAIL;
+        addr.numberMode = CdmaSmsAddress.NUMBER_MODE_NOT_DATA_NETWORK;
+        addr.numberPlan = CdmaSmsAddress.NUMBERING_PLAN_UNKNOWN;
+        addr.address = "8005551212";
+        addr.numberOfDigits = (byte)addr.address.length();
+        bearerData.callbackNumber = addr;
+        byte []encodedSms = BearerData.encode(bearerData);
+        BearerData revBearerData = BearerData.decode(encodedSms);
+        CdmaSmsAddress revAddr = revBearerData.callbackNumber;
+        assertEquals(addr.digitMode, revAddr.digitMode);
+        assertEquals(addr.ton, revAddr.ton);
+        assertEquals(addr.numberMode, revAddr.numberMode);
+        assertEquals(addr.numberPlan, revAddr.numberPlan);
+        assertEquals(addr.numberOfDigits, revAddr.numberOfDigits);
+        assertEquals(addr.address, revAddr.address);
+        addr.address = "8*55#1012";
+        addr.numberOfDigits = (byte)addr.address.length();
+        addr.digitMode = CdmaSmsAddress.DIGIT_MODE_4BIT_DTMF;
+        encodedSms = BearerData.encode(bearerData);
+        revBearerData = BearerData.decode(encodedSms);
+        revAddr = revBearerData.callbackNumber;
+        assertEquals(addr.digitMode, revAddr.digitMode);
+        assertEquals(addr.numberOfDigits, revAddr.numberOfDigits);
+        assertEquals(addr.address, revAddr.address);
+    }
+
+    @SmallTest
+    public void testMsgCenterTimeStampFeedback() throws Exception {
+        BearerData bearerData = new BearerData();
+        bearerData.messageType = BearerData.MESSAGE_TYPE_DELIVER;
+        bearerData.messageId = 0;
+        bearerData.hasUserDataHeader = false;
+        bearerData.userData = makeUserData("test message center timestamp");
+        bearerData.timeStamp = HexDump.hexStringToByteArray("112233445566");
+        byte []encodedSms = BearerData.encode(bearerData);
+        BearerData revBearerData = BearerData.decode(encodedSms);
+        assertEquals(HexDump.toHexString(bearerData.timeStamp),
+                     HexDump.toHexString(revBearerData.timeStamp));
+    }
+
+    // XXX test messageId
+
+    // String pdu1 = "0003104090010d4866a794e07055965b91d040300c0100"; sid 12
+    // String pdu1 = "0003104090011748bea794e0731436ef3bd7c2e0352eef27a1c263fe58080d0101"; sid 13
+    // Log.d(LOG_TAG, "revBearerData -- " + revBearerData);
+
+}
diff --git a/tests/AndroidTests/src/com/android/unit_tests/accounts/AccountManagerServiceTest.java b/tests/AndroidTests/src/com/android/unit_tests/accounts/AccountManagerServiceTest.java
index 90c0ec039339..6b8e1f0bc7bc 100644
--- a/tests/AndroidTests/src/com/android/unit_tests/accounts/AccountManagerServiceTest.java
+++ b/tests/AndroidTests/src/com/android/unit_tests/accounts/AccountManagerServiceTest.java
@@ -81,7 +81,7 @@ public class AccountManagerServiceTest extends AndroidTestCase {
         assertEquals(a22, accounts[4]);
         assertEquals(a32, accounts[5]);
 
-        accounts = ams.getAccountsByType("type1");
+        accounts = ams.getAccountsByType("type1" );
         Arrays.sort(accounts, new AccountSorter());
         assertEquals(3, accounts.length);
         assertEquals(a11, accounts[0]);
@@ -90,7 +90,7 @@ public class AccountManagerServiceTest extends AndroidTestCase {
 
         ams.removeAccount(a21);
 
-        accounts = ams.getAccountsByType("type1");
+        accounts = ams.getAccountsByType("type1" );
         Arrays.sort(accounts, new AccountSorter());
         assertEquals(2, accounts.length);
         assertEquals(a11, accounts[0]);
@@ -176,13 +176,6 @@ public class AccountManagerServiceTest extends AndroidTestCase {
         assertNull(ams.peekAuthToken(a12, "att2"));
         assertEquals("a12_att3", ams.peekAuthToken(a12, "att3"));
 
-        // check that the authtoken cache is consistent with the database
-        assertEquals(5, ams.mAuthTokenCache.size());
-        for (Map.Entry<AccountManagerService.AuthTokenKey, String> entry
-                : ams.mAuthTokenCache.entrySet()) {
-            assertEquals(entry.getValue(), ams.readAuthTokenFromDatabase(
-                    entry.getKey().mAccount, entry.getKey().mAuthTokenType));
-        }
         assertNull(ams.readAuthTokenFromDatabase(a12, "att2"));
     }
 }
\ No newline at end of file
diff --git a/tests/CoreTests/android/content/SyncStorageEngineTest.java b/tests/CoreTests/android/content/SyncStorageEngineTest.java
index 36805b15e864..27f1b8be63f2 100644
--- a/tests/CoreTests/android/content/SyncStorageEngineTest.java
+++ b/tests/CoreTests/android/content/SyncStorageEngineTest.java
@@ -21,6 +21,7 @@ import android.test.RenamingDelegatingContext;
 import android.test.mock.MockContext;
 import android.test.mock.MockContentResolver;
 import android.provider.Sync;
+import android.accounts.Account;
 
 public class SyncStorageEngineTest extends AndroidTestCase {
 
@@ -29,7 +30,7 @@ public class SyncStorageEngineTest extends AndroidTestCase {
      * correcponding sync is finished. This can happen if the clock changes while we are syncing.
      */
     public void testPurgeActiveSync() throws Exception {
-        final String account = "a@example.com";
+        final Account account = new Account("a@example.com", "example.type");
         final String authority = "testprovider";
 
         MockContentResolver mockResolver = new MockContentResolver();
diff --git a/tests/DumpRenderTree/run_page_cycler.py b/tests/DumpRenderTree/assets/run_page_cycler.py
index 7f728a38245a..2325047a1840 100755
--- a/tests/DumpRenderTree/run_page_cycler.py
+++ b/tests/DumpRenderTree/assets/run_page_cycler.py
@@ -56,7 +56,7 @@ def main(options, args):
   run_load_test_cmd_postfix = " -w com.android.dumprendertree/.LayoutTestsAutoRunner"
 
   # Call LoadTestsAutoTest::runTest.
-  run_load_test_cmd = run_load_test_cmd_prefix + " -e class com.android.dumprendertree.LoadTestsAutoTest#runTest -e path \"" + path + "\" -e timeout " + timeout_ms + run_load_test_cmd_postfix
+  run_load_test_cmd = run_load_test_cmd_prefix + " -e class com.android.dumprendertree.LoadTestsAutoTest#runPageCyclerTest -e path \"" + path + "\" -e timeout " + timeout_ms + run_load_test_cmd_postfix
 
   (adb_output, adb_error) = subprocess.Popen(run_load_test_cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
   if adb_output.find('INSTRUMENTATION_FAILED') != -1 or \
diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/LayoutTestsAutoTest.java b/tests/DumpRenderTree/src/com/android/dumprendertree/LayoutTestsAutoTest.java
index 39eae02940d2..562b1f32aaca 100644
--- a/tests/DumpRenderTree/src/com/android/dumprendertree/LayoutTestsAutoTest.java
+++ b/tests/DumpRenderTree/src/com/android/dumprendertree/LayoutTestsAutoTest.java
@@ -16,24 +16,11 @@
 
 package com.android.dumprendertree;
 
-import android.app.Activity;
 import android.app.Instrumentation;
-import android.app.Instrumentation.ActivityMonitor;
-import android.content.ContentResolver;
-import android.content.ContentValues;
 import android.content.Intent;
-
-import android.util.Log;
-import android.view.KeyEvent;
-import android.webkit.WebSettings;
-
 import android.os.Bundle;
-import android.os.Message;
 import android.test.ActivityInstrumentationTestCase2;
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.LargeTest;
-
-import com.android.dumprendertree.TestShellActivity;
+import android.util.Log;
 
 import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
@@ -141,6 +128,7 @@ public class LayoutTestsAutoTest extends ActivityInstrumentationTestCase2<TestSh
     private Vector<String> mTestList;
     private boolean mRebaselineResults;
     private String mTestPathPrefix;
+    private boolean mFinished;
     
     public LayoutTestsAutoTest() {
       super("com.android.dumprendertree", TestShellActivity.class);
@@ -290,6 +278,7 @@ public class LayoutTestsAutoTest extends ActivityInstrumentationTestCase2<TestSh
         activity.setCallback(new TestShellCallback() {
             public void finished() {
                 synchronized (LayoutTestsAutoTest.this) {
+                    mFinished = true;
                     LayoutTestsAutoTest.this.notifyAll();
                 }
             }         
@@ -306,6 +295,7 @@ public class LayoutTestsAutoTest extends ActivityInstrumentationTestCase2<TestSh
             resultFile = getAndroidExpectedResultFile(expectedResultFile);
         }
         
+        mFinished = false;
         Intent intent = new Intent(Intent.ACTION_VIEW);
         intent.setClass(activity, TestShellActivity.class);
         intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
@@ -316,9 +306,11 @@ public class LayoutTestsAutoTest extends ActivityInstrumentationTestCase2<TestSh
       
         // Wait until done.
         synchronized (this) {
-            try {
-                this.wait();
-            } catch (InterruptedException e) { }
+            while(!mFinished){
+                try {
+                    this.wait();
+                } catch (InterruptedException e) { }
+            }
         }
         
         if (!mRebaselineResults) {
@@ -478,7 +470,7 @@ public class LayoutTestsAutoTest extends ActivityInstrumentationTestCase2<TestSh
                 byte[] buf = new byte[2048];
                 int len;
 
-                while ((len = in.read(buf)) > 0 ) {
+                while ((len = in.read(buf)) >= 0 ) {
                     out.write(buf, 0, len);
                 }
                 out.close();
diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/LoadTestsAutoTest.java b/tests/DumpRenderTree/src/com/android/dumprendertree/LoadTestsAutoTest.java
index 9e1e9ed253b0..5cb51554abfc 100644
--- a/tests/DumpRenderTree/src/com/android/dumprendertree/LoadTestsAutoTest.java
+++ b/tests/DumpRenderTree/src/com/android/dumprendertree/LoadTestsAutoTest.java
@@ -31,12 +31,18 @@ import com.android.dumprendertree.TestShellCallback;
 
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.io.PrintStream;
 
 public class LoadTestsAutoTest extends ActivityInstrumentationTestCase2<TestShellActivity> {
 
     private final static String LOGTAG = "LoadTest";
     private final static String LOAD_TEST_RESULT = "/sdcard/load_test_result.txt";
+    private boolean mFinished;
+    static final String LOAD_TEST_RUNNER_FILES[] = {
+        "run_page_cycler.py"
+  };
 
     public LoadTestsAutoTest() {
         super("com.android.dumprendertree", TestShellActivity.class);
@@ -53,7 +59,7 @@ public class LoadTestsAutoTest extends ActivityInstrumentationTestCase2<TestShel
 
     // Invokes running of layout tests
     // and waits till it has finished running.
-    public void runTest() {
+    public void runPageCyclerTest() {
         LayoutTestsAutoRunner runner = (LayoutTestsAutoRunner) getInstrumentation();
 
         if (runner.mTestPath == null) {
@@ -124,11 +130,13 @@ public class LoadTestsAutoTest extends ActivityInstrumentationTestCase2<TestShel
         activity.setCallback(new TestShellCallback() {
             public void finished() {
                 synchronized (LoadTestsAutoTest.this) {
+                    mFinished = true;
                     LoadTestsAutoTest.this.notifyAll();
                 }
             }
         });
 
+        mFinished = false;
         Intent intent = new Intent(Intent.ACTION_VIEW);
         intent.setClass(activity, TestShellActivity.class);
         intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
@@ -139,9 +147,38 @@ public class LoadTestsAutoTest extends ActivityInstrumentationTestCase2<TestShel
 
         // Wait until done.
         synchronized (this) {
-            try {
-                this.wait();
-            } catch (InterruptedException e) { }
+            while(!mFinished) {
+                try {
+                    this.wait();
+                } catch (InterruptedException e) { }
+            }
+        }
+    }
+
+    public void copyRunnerAssetsToCache() {
+        try {
+            String out_dir = getActivity().getApplicationContext()
+                .getCacheDir().getPath() + "/";
+
+            for( int i=0; i< LOAD_TEST_RUNNER_FILES.length; i++) {
+                InputStream in = getActivity().getAssets().open(
+                        LOAD_TEST_RUNNER_FILES[i]);
+                OutputStream out = new FileOutputStream(
+                        out_dir + LOAD_TEST_RUNNER_FILES[i]);
+
+                byte[] buf = new byte[2048];
+                int len;
+
+                while ((len = in.read(buf)) >= 0 ) {
+                    out.write(buf, 0, len);
+                }
+                out.close();
+                in.close();
+            }
+        }catch (IOException e) {
+          e.printStackTrace();
         }
+
     }
+
 }
diff --git a/tests/FrameworkTest/tests/src/android/content/AbstractTableMergerTest.java b/tests/FrameworkTest/tests/src/android/content/AbstractTableMergerTest.java
index aa3d186e3416..42c1e789b9c3 100644
--- a/tests/FrameworkTest/tests/src/android/content/AbstractTableMergerTest.java
+++ b/tests/FrameworkTest/tests/src/android/content/AbstractTableMergerTest.java
@@ -8,6 +8,7 @@ import android.database.sqlite.SQLiteDatabase;
 import android.net.Uri;
 import android.test.AndroidTestCase;
 import android.text.TextUtils;
+import android.accounts.Account;
 
 import java.util.ArrayList;
 import java.util.Map;
@@ -26,7 +27,7 @@ public class AbstractTableMergerTest extends AndroidTestCase {
     static final Uri TABLE_URI = Uri.withAppendedPath(CONTENT_URI, TABLE_NAME);
     static final Uri DELETED_TABLE_URI = Uri.withAppendedPath(CONTENT_URI, DELETED_TABLE_NAME);
 
-    private final String ACCOUNT = "account@goo.com";
+    private final Account ACCOUNT = new Account("account@goo.com", "example.type");
 
     private final ArrayList<Expectation> mExpectations = Lists.newArrayList();
 
@@ -65,25 +66,31 @@ public class AbstractTableMergerTest extends AndroidTestCase {
         mExpectations.clear();
     }
 
-    ContentValues newValues(String data, String syncId, String syncAccount,
+    ContentValues newValues(String data, String syncId, Account syncAccount,
             String syncTime, String syncVersion, Long syncLocalId) {
         ContentValues values = new ContentValues();
         if (data != null) values.put("data", data);
         if (syncTime != null) values.put("_sync_time", syncTime);
         if (syncVersion != null) values.put("_sync_version", syncVersion);
         if (syncId != null) values.put("_sync_id", syncId);
-        if (syncAccount != null) values.put("_sync_account", syncAccount);
+        if (syncAccount != null) {
+            values.put("_sync_account", syncAccount.mName);
+            values.put("_sync_account_type", syncAccount.mType);
+        }
         values.put("_sync_local_id", syncLocalId);
         values.put("_sync_dirty", 0);
         return values;
     }
 
-    ContentValues newDeletedValues(String syncId, String syncAccount, String syncVersion,
+    ContentValues newDeletedValues(String syncId, Account syncAccount, String syncVersion,
             Long syncLocalId) {
         ContentValues values = new ContentValues();
         if (syncVersion != null) values.put("_sync_version", syncVersion);
         if (syncId != null) values.put("_sync_id", syncId);
-        if (syncAccount != null) values.put("_sync_account", syncAccount);
+        if (syncAccount != null) {
+            values.put("_sync_account", syncAccount.mName);
+            values.put("_sync_account_type", syncAccount.mType);
+        }
         if (syncLocalId != null) values.put("_sync_local_id", syncLocalId);
         return values;
     }
@@ -380,6 +387,7 @@ public class AbstractTableMergerTest extends AndroidTestCase {
                     + "_sync_local_id INTEGER, "
                     + "_sync_dirty INTEGER NOT NULL DEFAULT 0, "
                     + "_sync_account TEXT, "
+                    + "_sync_account_type TEXT, "
                     + "_sync_mark INTEGER)");
 
             mDb.execSQL("CREATE TABLE deleted_items ("
@@ -388,6 +396,7 @@ public class AbstractTableMergerTest extends AndroidTestCase {
                     + "_sync_id TEXT, "
                     + "_sync_local_id INTEGER, "
                     + "_sync_account TEXT, "
+                    + "_sync_account_type TEXT, "
                     + "_sync_mark INTEGER)");
         }
 
@@ -501,7 +510,7 @@ public class AbstractTableMergerTest extends AndroidTestCase {
             throw new UnsupportedOperationException();
         }
 
-        public void onSyncStart(SyncContext context, String account) {
+        public void onSyncStart(SyncContext context, Account account) {
             throw new UnsupportedOperationException();
         }
 
@@ -509,7 +518,7 @@ public class AbstractTableMergerTest extends AndroidTestCase {
             throw new UnsupportedOperationException();
         }
 
-        public String getSyncingAccount() {
+        public Account getSyncingAccount() {
             throw new UnsupportedOperationException();
         }
 
@@ -544,24 +553,24 @@ public class AbstractTableMergerTest extends AndroidTestCase {
             throw new UnsupportedOperationException();
         }
 
-        protected void onAccountsChanged(String[] accountsArray) {
+        protected void onAccountsChanged(Account[] accountsArray) {
             throw new UnsupportedOperationException();
         }
 
-        protected void deleteRowsForRemovedAccounts(Map<String, Boolean> accounts, String table,
-                String accountColumnName) {
+        protected void deleteRowsForRemovedAccounts(Map<Account, Boolean> accounts, String table
+        ) {
             throw new UnsupportedOperationException();
         }
 
-        public void wipeAccount(String account) {
+        public void wipeAccount(Account account) {
             throw new UnsupportedOperationException();
         }
 
-        public byte[] readSyncDataBytes(String account) {
+        public byte[] readSyncDataBytes(Account account) {
             throw new UnsupportedOperationException();
         }
 
-        public void writeSyncDataBytes(String account, byte[] data) {
+        public void writeSyncDataBytes(Account account, byte[] data) {
             throw new UnsupportedOperationException();
         }
     }
diff --git a/tests/sketch/Android.mk b/tests/sketch/Android.mk
new file mode 100644
index 000000000000..814e37030967
--- /dev/null
+++ b/tests/sketch/Android.mk
@@ -0,0 +1,8 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+
+LOCAL_PACKAGE_NAME := Sketch
+
+include $(BUILD_PACKAGE)
diff --git a/tests/sketch/AndroidManifest.xml b/tests/sketch/AndroidManifest.xml
new file mode 100755
index 000000000000..c44b54e5e201
--- /dev/null
+++ b/tests/sketch/AndroidManifest.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      package="com.android.gesture"
+      android:versionCode="1"
+      android:versionName="1.0.0">
+      <application android:icon="@drawable/icon" android:label="@string/app_name">
+        <activity android:name="com.android.gesture.example.GestureEntryDemo"
+                  android:label="@string/app_name">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity android:name="com.android.gesture.example.GestureLibViewer"/>
+    </application>
+</manifest> 
diff --git a/tests/sketch/res/drawable/icon.png b/tests/sketch/res/drawable/icon.png
new file mode 100755
index 000000000000..75024841d327
--- /dev/null
+++ b/tests/sketch/res/drawable/icon.png
diff --git a/tests/sketch/res/layout/demo.xml b/tests/sketch/res/layout/demo.xml
new file mode 100755
index 000000000000..e516229234d9
--- /dev/null
+++ b/tests/sketch/res/layout/demo.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content">
+    <Spinner 
+        android:id="@+id/spinner"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:drawSelectorOnTop="true"
+        android:prompt="@string/recognition_result"/>
+    
+    <com.android.gesture.GesturePad 
+        android:id="@+id/drawingpad"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"/>
+    
+</LinearLayout>
diff --git a/tests/sketch/res/layout/gestureviewer.xml b/tests/sketch/res/layout/gestureviewer.xml
new file mode 100755
index 000000000000..5302d34cd253
--- /dev/null
+++ b/tests/sketch/res/layout/gestureviewer.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content">
+    
+    <Spinner 
+        android:id="@+id/spinner"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:drawSelectorOnTop="true"
+        android:prompt="@string/recognition_result"/>
+    
+    <com.android.gesture.GesturePad 
+        android:id="@+id/drawingpad"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"/>
+
+    <LinearLayout 
+        android:orientation="horizontal"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content">        
+       <Button 
+          android:id="@+id/previous"
+          android:text="@string/previous"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_weight="1"/>
+       <Button 
+          android:id="@+id/remove"
+          android:text="@string/remove"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_weight="1"/>
+       <Button 
+          android:id="@+id/next"
+          android:text="@string/next"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_weight="1"/>
+    </LinearLayout>
+    
+</LinearLayout>
diff --git a/tests/sketch/res/layout/newgesture_dialog.xml b/tests/sketch/res/layout/newgesture_dialog.xml
new file mode 100755
index 000000000000..6e45d81a424d
--- /dev/null
+++ b/tests/sketch/res/layout/newgesture_dialog.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+            
+    <EditText
+        android:id="@+id/gesturename_edit"
+        android:layout_height="wrap_content"
+        android:layout_width="fill_parent"
+        android:layout_marginLeft="20dip"
+        android:layout_marginRight="20dip"
+        android:scrollHorizontally="true"
+        android:autoText="false"
+        android:capitalize="none"
+        android:gravity="fill_horizontal"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+        
+</LinearLayout>
diff --git a/tests/sketch/res/values/strings.xml b/tests/sketch/res/values/strings.xml
new file mode 100755
index 000000000000..4c6aa205ae3d
--- /dev/null
+++ b/tests/sketch/res/values/strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+    <string name="app_name">Gesture Demo</string>
+    <string name="recognition_result">Recognition Result</string>
+    <string name="clear">Clear</string>
+    <string name="newgesture">Add</string>
+    <string name="viewgesture">View</string>
+    <string name="newgesture_dialog_ok">OK</string>
+    <string name="newgesture_dialog_cancel">Cancel</string>
+    <string name="newgesture_text_entry">Gesture Name</string>
+    <string name="previous">Previous</string>
+    <string name="remove">Remove</string>
+    <string name="next">Next</string>
+</resources>
diff --git a/tests/sketch/src/com/android/gesture/Gesture.java b/tests/sketch/src/com/android/gesture/Gesture.java
new file mode 100755
index 000000000000..29c07adbc18a
--- /dev/null
+++ b/tests/sketch/src/com/android/gesture/Gesture.java
@@ -0,0 +1,361 @@
+/*
+ * Copyright (C) 2008-2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.gesture;
+
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Matrix;
+import android.graphics.Paint;
+import android.graphics.Path;
+import android.graphics.PointF;
+import android.graphics.RectF;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import com.android.gesture.recognizer.RecognitionUtil;
+
+import org.xmlpull.v1.XmlSerializer;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.StringTokenizer;
+
+/**
+ * A single stroke gesture.
+ */
+
+public class Gesture implements Parcelable {
+
+    private RectF mBBX;
+    private float mLength = 0;
+    private int mColor;
+    private float mWidth;
+    private ArrayList<PointF> mPtsBuffer = new ArrayList<PointF>();
+    private long mTimestamp = 0;
+    private long mID;
+    
+    private static final long systemStartupTime = System.currentTimeMillis();
+    private static int instanceCount = 0; 
+
+    public Gesture() {
+        mID = systemStartupTime + instanceCount++;
+    }
+
+    public void setColor(int c) {
+        mColor = c;
+    }
+    
+    public void setStrokeWidth(float w) {
+        mWidth = w;
+    }
+    
+    public int getColor() {
+        return mColor;
+    }
+    
+    public float getStrokeWidth() {
+        return mWidth;
+    }
+  
+    public ArrayList<PointF> getPoints() {
+        return this.mPtsBuffer;
+    }
+  
+    public int numOfPoints() {
+        return this.mPtsBuffer.size();
+    }
+
+    public void addPoint(float x, float y) {
+        mPtsBuffer.add(new PointF(x, y));
+        if (mBBX == null) {
+            mBBX = new RectF();
+            mBBX.top = y;
+            mBBX.left = x;
+            mBBX.right = x;
+            mBBX.bottom = y;
+            mLength = 0;
+        }
+        else {
+            PointF lst = mPtsBuffer.get(mPtsBuffer.size()-2);
+            mLength += Math.sqrt(Math.pow(x-lst.x, 2)+Math.pow(y-lst.y, 2));
+            mBBX.union(x, y);
+        }
+        mTimestamp = System.currentTimeMillis();
+    }
+
+    /**
+     * @return the length of the gesture
+     */
+    public float getLength() {
+        return this.mLength;
+    }
+  
+    public RectF getBBX() {
+        return mBBX;
+    }
+  
+    public void setID(long id) {
+        mID = id;
+    }
+    
+    public long getID() {
+        return mID;
+    }
+    
+    public long getTimeStamp() {
+        return mTimestamp;
+    }
+    
+    public void setTimestamp(long t) {
+  	    this.mTimestamp = t;
+    }
+    
+    /**
+     * draw the gesture
+     * @param canvas
+     */
+    public void draw(Canvas canvas) {
+        Paint paint = new Paint();
+        paint.setAntiAlias(true);
+        paint.setDither(true);
+        paint.setColor(mColor);
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setStrokeJoin(Paint.Join.ROUND);
+        paint.setStrokeCap(Paint.Cap.ROUND);
+        paint.setStrokeWidth(mWidth);
+        
+        Path path = null;
+        float mX = 0, mY = 0;
+        Iterator<PointF> it = mPtsBuffer.iterator();
+        while (it.hasNext()) {
+          PointF p = it.next();
+          float x = p.x;
+          float y = p.y;
+          if (path == null) {
+            path = new Path();
+            path.moveTo(x, y);
+            mX = x;
+            mY = y;
+          } else {
+            float dx = Math.abs(x - mX);
+            float dy = Math.abs(y - mY);
+            if (dx >= 3 || dy >= 3) {
+                path.quadTo(mX, mY, (x + mX)/2, (y + mY)/2);
+                mX = x;
+                mY = y;
+            }
+          }
+        }
+        
+        canvas.drawPath(path, paint);
+    }
+    
+    /**
+     * convert the gesture to a Path
+     * @param width the width of the bounding box of the target path
+     * @param height the height of the bounding box of the target path
+     * @param numSample the num of points needed
+     * @return the path
+     */
+    public Path toPath(float width, float height, int numSample) {
+        float[] pts = RecognitionUtil.resample(this, numSample);
+        RectF rect = this.getBBX();
+        float scale = height / rect.height();
+        Matrix matrix = new Matrix();
+        matrix.setTranslate(-rect.left, -rect.top);
+        Matrix scalem = new Matrix();
+        scalem.setScale(scale, scale);
+        matrix.postConcat(scalem);
+        Matrix translate = new Matrix();
+        matrix.postConcat(translate);
+        matrix.mapPoints(pts);
+        
+        Path path = null;
+        float mX = 0, mY = 0;
+        for (int i=0; i<pts.length-1; i+=2) {
+          float x = pts[i];
+          float y = pts[i+1];
+          if (path == null) {
+            path = new Path();
+            path.moveTo(x, y);
+            mX = x;
+            mY = y;
+          } else {
+            float dx = Math.abs(x - mX);
+            float dy = Math.abs(y - mY);
+            if (dx >= 3 || dy >= 3) {
+                path.quadTo(mX, mY, (x + mX)/2, (y + mY)/2);
+                mX = x;
+                mY = y;
+            }
+          }
+        }
+        return path;
+    }
+  
+    /**
+     * get a bitmap thumbnail of the gesture with a transparent background
+     * @param w
+     * @param h
+     * @param edge
+     * @param numSample
+     * @param foreground
+     * @return
+     */
+    public Bitmap toBitmap(int w, int h, 
+        int edge, int numSample) {
+        RectF bbx = this.getBBX();
+        Bitmap bitmap = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_8888);
+        Path path = this.toPath(w - 2 * edge, h - 2 * edge, numSample);
+        Canvas c = new Canvas(bitmap);
+        //c.drawColor(background);
+        c.translate(edge, edge);
+        Paint paint = new Paint();
+        paint.setAntiAlias(true);
+        paint.setDither(true);
+        paint.setColor(mColor);
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setStrokeJoin(Paint.Join.ROUND);
+        paint.setStrokeCap(Paint.Cap.ROUND);
+        paint.setStrokeWidth(2);
+        c.drawPath(path, paint);
+        return bitmap;
+    }
+    
+    /**
+     * save the gesture as XML
+     * @param namespace
+     * @param serializer
+     * @throws IOException
+     */
+    public void toXML(String namespace, XmlSerializer serializer) throws IOException {
+        serializer.startTag(namespace, "stroke");
+        serializer.attribute(namespace, "timestamp", Long.toString(mTimestamp));
+        serializer.attribute(namespace, "id", Long.toString(mID));
+        serializer.attribute(namespace, "color", Integer.toString(mColor));
+        serializer.attribute(namespace, "width", Float.toString(mWidth));
+        Iterator it = this.mPtsBuffer.iterator();
+        String pts = "";
+        while (it.hasNext()) {
+        	PointF fp = (PointF)it.next();
+        	if (pts.length() > 0)
+        		pts += ",";
+        	pts += fp.x + "," + fp.y;
+        }
+        serializer.text(pts);
+        serializer.endTag(namespace, "stroke");
+    }
+    
+    
+    public void createFromString(String str) {
+        StringTokenizer st = new StringTokenizer(str, "#");
+        
+        String para = st.nextToken();
+        StringTokenizer innerst = new StringTokenizer(para, ",");
+        this.mBBX = new RectF();
+        this.mBBX.left = Float.parseFloat(innerst.nextToken());
+        this.mBBX.top = Float.parseFloat(innerst.nextToken());
+        this.mBBX.right = Float.parseFloat(innerst.nextToken());
+        this.mBBX.bottom = Float.parseFloat(innerst.nextToken());
+        
+        para = st.nextToken();
+        innerst = new StringTokenizer(para, ",");
+        while (innerst.hasMoreTokens()) {
+          String s = innerst.nextToken().trim();
+          if (s.length()==0)
+            break;
+          float x = Float.parseFloat(s);
+          float y = Float.parseFloat(innerst.nextToken());
+          this.mPtsBuffer.add(new PointF(x, y));
+        }
+  
+        para = st.nextToken();
+        this.mColor = Integer.parseInt(para);
+        
+        para = st.nextToken();
+        this.mWidth = Float.parseFloat(para);
+        
+        para = st.nextToken();
+        this.mLength = Float.parseFloat(para);
+        
+        para = st.nextToken();
+        this.mTimestamp = Long.parseLong(para);
+    }
+    
+    @Override
+    public String toString() {
+        String str = "";
+        
+        str += "#" + this.mBBX.left + "," + this.mBBX.top + "," +
+               this.mBBX.right + "," + this.mBBX.bottom;
+        
+        str += "#";
+        Iterator<PointF> it = this.mPtsBuffer.iterator();
+        while (it.hasNext()) {
+          PointF fp = it.next();
+          str += fp.x + "," + fp.y + ","; 
+        }
+
+        str += "#";
+        str += this.mColor;
+        
+        str += "#";
+        str += this.mWidth;
+        
+        str += "#";
+        str += this.mLength;
+        
+        str += "#";
+        str += this.mTimestamp;
+  
+        return str;
+    }
+    
+    public static final Parcelable.Creator CREATOR = new Parcelable.Creator() {
+        public Gesture createFromParcel(Parcel in) {
+            String str = in.readString();
+            Gesture stk = new Gesture();
+            stk.createFromString(str);
+            return stk;
+        }
+    
+        public Gesture[] newArray(int size) {
+            return new Gesture[size];
+        }
+    };
+    
+    public static Gesture buildFromArray(byte[] bytes) {
+        String str = new String(bytes);
+        Gesture stk = new Gesture();
+        stk.createFromString(str);
+        return stk;
+    }
+    
+    public static byte[] saveToArray(Gesture stk) {
+        String str = stk.toString();   
+        return str.getBytes();
+    }
+    
+    public void writeToParcel(Parcel out, int flags) {
+        out.writeString(this.toString());
+    }
+      
+    public int describeContents() {
+        return CONTENTS_FILE_DESCRIPTOR;
+    }
+}
diff --git a/tests/sketch/src/com/android/gesture/GestureLib.java b/tests/sketch/src/com/android/gesture/GestureLib.java
new file mode 100755
index 000000000000..d0a25f22058d
--- /dev/null
+++ b/tests/sketch/src/com/android/gesture/GestureLib.java
@@ -0,0 +1,280 @@
+/*
+ * Copyright (C) 2008-2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.gesture;
+
+import android.util.Log;
+import android.util.Xml;
+import android.util.Xml.Encoding;
+
+import com.android.gesture.recognizer.Classifier;
+import com.android.gesture.recognizer.Instance;
+import com.android.gesture.recognizer.NearestNeighbor;
+import com.android.gesture.recognizer.Prediction;
+
+import org.xml.sax.Attributes;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+import org.xmlpull.v1.XmlSerializer;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.StringTokenizer;
+
+public class GestureLib {
+  
+    private static final String LOGTAG = "GestureLib";
+    private static String namespace = "ink";
+    private final String datapath;
+    private HashMap<String, ArrayList<Gesture>> name2gestures =
+          new HashMap<String, ArrayList<Gesture>>();
+    private Classifier mClassifier;
+
+    public GestureLib(String path) {
+        datapath = path;
+        mClassifier = new NearestNeighbor();
+    }
+    
+    public Classifier getClassifier() {
+        return mClassifier;
+    }
+    
+    /**
+     * get all the labels in the library
+     * @return a set of strings
+     */
+    public Set<String> getLabels() {
+        return name2gestures.keySet();
+    }
+    
+    public ArrayList<Prediction> recognize(Gesture gesture) {
+        Instance instance = Instance.createInstance(gesture, null);
+        return mClassifier.classify(instance);
+    }
+    
+    public void addGesture(String name, Gesture gesture) {
+        Log.v(LOGTAG, "add an example for gesture: " + name);
+        ArrayList<Gesture> gestures = name2gestures.get(name);
+        if (gestures == null) {
+            gestures = new ArrayList<Gesture>();
+            name2gestures.put(name, gestures);
+        }
+        gestures.add(gesture);
+        mClassifier.addInstance(
+            Instance.createInstance(gesture, name));
+    }
+    
+    public void removeGesture(String name, Gesture gesture) {
+      ArrayList<Gesture> gestures = name2gestures.get(name);
+      if (gestures == null) {
+          return;
+      } 
+      
+      gestures.remove(gesture);
+      
+      // if there are no more samples, remove the entry automatically 
+      if (gestures.isEmpty()) {
+          name2gestures.remove(name);
+      }
+      
+      mClassifier.removeInstance(gesture.getID());
+    }
+    
+    public ArrayList<Gesture> getGestures(String label) {
+        ArrayList<Gesture> gestures = name2gestures.get(label);
+        if (gestures != null)
+            return (ArrayList<Gesture>)gestures.clone();
+        else
+            return null;
+    }
+    
+    public void load() {
+        String filename = datapath
+                        + File.separator + "gestures.xml";
+        File f = new File(filename);
+        if (f.exists()) {
+            try {
+                loadInk(filename, null);
+            }
+            catch (SAXException ex) {
+                ex.printStackTrace();
+            } catch (IOException ex) {
+                ex.printStackTrace();
+            }
+        }
+    }
+    
+    public void save() {
+        try {
+            compactSave();
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+    }
+    
+    private void compactSave() throws IOException {
+        File f = new File(datapath);
+        if (f.exists() == false) {
+            f.mkdirs();
+        }
+        String filename = datapath + File.separator + "gestures.xml";
+        Log.v(LOGTAG, "save to " + filename);
+        BufferedOutputStream fos = new BufferedOutputStream(
+            new FileOutputStream(filename)); 
+        
+        PrintWriter writer = new PrintWriter(fos);
+        XmlSerializer serializer = Xml.newSerializer();
+        serializer.setOutput(writer);
+        serializer.startDocument(Encoding.ISO_8859_1.name(), null);
+        serializer.startTag(namespace, "gestures");
+        Iterator<String> it = name2gestures.keySet().iterator();
+        while (it.hasNext()) {
+            String key = it.next();
+            ArrayList<Gesture> gestures = name2gestures.get(key);
+            saveGestures(serializer, key, gestures);
+        }
+        
+        serializer.endTag(namespace, "gestures");
+        serializer.endDocument();
+        serializer.flush();
+        writer.close();
+        fos.close();    
+    }
+    
+    private static void saveGestures(XmlSerializer serializer,
+        String name, ArrayList<Gesture> strokes) throws IOException {
+        serializer.startTag(namespace, "gesture");
+        serializer.startTag(namespace, "name");
+        serializer.text(name);
+        serializer.endTag(namespace, "name");
+        Iterator<Gesture> it = strokes.iterator();
+        while (it.hasNext()) {
+          Gesture stk = it.next();
+          stk.toXML(namespace, serializer);
+        }
+        serializer.endTag(namespace, "gesture");
+    }
+  
+    private void loadInk(String filename, String label) throws SAXException, IOException {
+        Log.v(LOGTAG, "load from " + filename);
+        BufferedInputStream in = new BufferedInputStream(
+            new FileInputStream(filename));
+        Xml.parse(in, Encoding.ISO_8859_1, new CompactInkHandler());
+        in.close();
+    }
+
+    class CompactInkHandler implements ContentHandler {
+        
+        Gesture currentGesture = null;
+        StringBuffer buffer = null;
+        String gestureName;
+        ArrayList<Gesture> gestures;
+        
+        CompactInkHandler() {
+        }
+        
+        // Receive notification of character data.
+        public void characters(char[] ch, int start, int length) {
+            buffer.append(ch, start, length);
+        }
+    
+        //Receive notification of the end of a document.
+        public void   endDocument() {
+        }
+        
+        // Receive notification of the end of an element.
+        public void   endElement(String uri, String localName, String qName) {
+            if (localName.equals("gesture")) {
+              name2gestures.put(gestureName, gestures);
+              gestures = null;
+            } else if (localName.equals("name")) {
+              gestureName = buffer.toString();
+            } else if (localName.equals("stroke")) {
+              StringTokenizer tokenizer = new StringTokenizer(buffer.toString(), ",");
+              while (tokenizer.hasMoreTokens()) {
+                  String str = tokenizer.nextToken();
+                  float x = Float.parseFloat(str);
+                  str = tokenizer.nextToken();
+                  float y = Float.parseFloat(str);
+                  try
+                  {
+                      currentGesture.addPoint(x, y);
+                  }
+                  catch(Exception ex) {
+                      ex.printStackTrace();
+                  }
+              }
+              gestures.add(currentGesture);
+              mClassifier.addInstance(
+                  Instance.createInstance(currentGesture, gestureName));
+              currentGesture = null;
+            }
+        }
+        
+        // End the scope of a prefix-URI mapping.
+        public void   endPrefixMapping(String prefix) {
+        }
+          
+        //Receive notification of ignorable whitespace in element content.
+        public void   ignorableWhitespace(char[] ch, int start, int length) {
+        }
+          
+        //Receive notification of a processing instruction.            
+        public void   processingInstruction(String target, String data) {
+        }
+          
+        // Receive an object for locating the origin of SAX document events.
+        public void   setDocumentLocator(Locator locator) {
+        }
+          
+        // Receive notification of a skipped entity.
+        public void   skippedEntity(String name) {
+        }
+          
+        // Receive notification of the beginning of a document.
+        public void   startDocument() {
+        }
+          
+        // Receive notification of the beginning of an element.
+        public void   startElement(String uri, String localName, String qName, Attributes atts) {
+            if (localName.equals("gesture")) {
+                gestures = new ArrayList<Gesture>();
+            } else if (localName.equals("name")) {
+                buffer = new StringBuffer();
+            } else if (localName.equals("stroke")) {
+                currentGesture = new Gesture();
+                currentGesture.setTimestamp(Long.parseLong(atts.getValue(namespace, "timestamp")));
+                currentGesture.setColor(Integer.parseInt(atts.getValue(namespace, "color")));
+                currentGesture.setStrokeWidth(Float.parseFloat(atts.getValue(namespace, "width")));
+                buffer = new StringBuffer();
+            }
+        }
+          
+        public void   startPrefixMapping(String prefix, String uri) {
+        }
+    }
+}
diff --git a/tests/sketch/src/com/android/gesture/GestureListener.java b/tests/sketch/src/com/android/gesture/GestureListener.java
new file mode 100755
index 000000000000..ebb41494a2ff
--- /dev/null
+++ b/tests/sketch/src/com/android/gesture/GestureListener.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2008-2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.gesture;
+
+import android.view.MotionEvent;
+
+public interface GestureListener {
+    public void onStartGesture(GesturePad pad, MotionEvent event);
+    public void onGesture(GesturePad pad, MotionEvent event);
+    public void onFinishGesture(GesturePad pad, MotionEvent event);
+}
diff --git a/tests/sketch/src/com/android/gesture/GesturePad.java b/tests/sketch/src/com/android/gesture/GesturePad.java
new file mode 100755
index 000000000000..45a09e6eca98
--- /dev/null
+++ b/tests/sketch/src/com/android/gesture/GesturePad.java
@@ -0,0 +1,371 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.gesture;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Matrix;
+import android.graphics.Paint;
+import android.graphics.Path;
+import android.graphics.PointF;
+import android.os.Handler;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.View;
+import java.util.ArrayList;
+import java.util.Iterator;
+
+/**
+ * A view for rendering and processing gestures
+ */
+
+public class GesturePad extends View {
+
+    public static final float TOUCH_TOLERANCE = 4;
+    public static final int default_foreground = Color.argb(255, 255, 255, 0);
+    private int         background = Color.argb(0, 0, 0, 0);
+    private int         foreground = default_foreground;
+    private int         uncertain_foreground = Color.argb(55, 255, 255, 0);
+    private Bitmap      mBitmap;
+    private Canvas      mCanvas;
+    private Path        mPath;
+    private Paint       mBitmapPaint;
+    private Paint       mPaint;
+    private Paint       mDebugPaint;
+    private float       mX, mY;
+    private boolean     mEnableInput = true; 
+    private boolean     mEnableRendering = true;
+    private boolean     mCacheGesture = true;
+    private Gesture       mCurrentGesture = null;
+    ArrayList<GestureListener> mGestureListeners = new ArrayList<GestureListener>();
+
+    private boolean     mShouldFadingOut = true;
+    private boolean     mIsFadingOut = false;
+    private float       mFadingAlpha = 1;
+    
+    private boolean     reconstruct = false;
+    
+    private ArrayList<Path> debug = new ArrayList<Path>();
+    private Handler mHandler = new Handler();
+    
+    private Runnable mFadingOut = new Runnable() {
+      public void run() {
+          mFadingAlpha -= 0.03f;
+          if (mFadingAlpha <= 0) {
+              mIsFadingOut = false;
+              mPath.reset();
+          } else {
+              mHandler.postDelayed(this, 100);
+          }
+          invalidate();
+      }
+   };
+
+    public GesturePad(Context context) {
+        super(context);
+        init();
+    }
+  
+    public GesturePad(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+    
+    public boolean isEnableRendering() {
+        return this.mEnableRendering;
+    }
+    
+    public Gesture getCurrentGesture() {
+        return mCurrentGesture;
+    }
+    
+    public Paint getPaint() {
+        return mPaint;
+    }
+    
+    public void setColor(int c) {
+        this.foreground = c;
+    }
+    
+    public void setFadingAlpha(float f) {
+        mFadingAlpha = f;
+    }
+    
+    public void setCurrentGesture(Gesture stk) {
+        this.mCurrentGesture = stk;
+        reconstruct = true;
+    }
+    
+    private void init() {
+        mDebugPaint = new Paint();
+        mDebugPaint.setColor(Color.WHITE);
+        mDebugPaint.setStrokeWidth(4);
+        mDebugPaint.setAntiAlias(true);
+        mDebugPaint.setStyle(Paint.Style.STROKE);
+        
+        mPaint = new Paint();
+        mPaint.setAntiAlias(true);
+        mPaint.setDither(true);
+        mPaint.setColor(foreground);
+        mPaint.setStyle(Paint.Style.STROKE);
+        mPaint.setStrokeJoin(Paint.Join.ROUND);
+        mPaint.setStrokeCap(Paint.Cap.ROUND);
+        mPaint.setStrokeWidth(12);
+        
+        mBitmapPaint = new Paint(Paint.DITHER_FLAG);
+        mPath = new Path();
+        
+        reconstruct = false;
+    }
+
+    public void cacheGesture(boolean b) {
+        mCacheGesture = b;
+    }
+      
+    public void enableRendering(boolean b) {
+        mEnableRendering = b;
+    }
+  
+    
+    @Override
+    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
+        // TODO Auto-generated method stub
+        super.onSizeChanged(w, h, oldw, oldh);
+        
+        if (w <=0 || h <=0)
+            return;
+        
+        int width = w>oldw? w : oldw;
+        int height = h>oldh? h : oldh;
+        Bitmap newBitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+        mCanvas = new Canvas(newBitmap);
+        
+        if (mBitmap != null) {
+            mCanvas.drawColor(background);
+            mCanvas.drawBitmap(mBitmap, 0, 0, mBitmapPaint);
+            mCanvas.drawPath(mPath, mPaint);
+        }
+        
+        mBitmap = newBitmap;
+    }
+
+    public void addGestureListener(GestureListener l) {
+        this.mGestureListeners.add(l);
+    }
+  
+    public void removeGestureListener(GestureListener l) {
+        this.mGestureListeners.remove(l);
+    }
+  
+    @Override
+    protected void onDraw(Canvas canvas) {
+        canvas.drawColor(background);
+        
+        if (mCacheGesture)
+            canvas.drawBitmap(mBitmap, 0, 0, mBitmapPaint);
+        
+        if (mIsFadingOut) {
+            int color = foreground;
+            int alpha = (int)(Color.alpha(color) * mFadingAlpha);
+            mPaint.setColor(Color.argb(alpha, 
+                Color.red(color), 
+                Color.green(color), 
+                Color.blue(color)));
+        } else if (mEnableRendering == false) {
+            mPaint.setColor(uncertain_foreground);
+        } else {
+            mPaint.setColor(foreground);
+        }
+        
+        if (reconstruct) {
+            
+            if (this.mCurrentGesture != null) {
+                float xedge = 30;
+                float yedge = 30;
+                float w = this.getWidth() - 2 * xedge;
+                float h = this.getHeight() - 2 * yedge;
+                float sx =  w / this.mCurrentGesture.getBBX().width();
+                float sy = h / mCurrentGesture.getBBX().height();
+                float scale = sx>sy?sy:sx;
+                convertFromStroke(mCurrentGesture);
+                Matrix matrix = new Matrix();
+                matrix.preTranslate(-mCurrentGesture.getBBX().centerX(), -mCurrentGesture.getBBX().centerY());
+                matrix.postScale(scale, scale);
+                matrix.postTranslate(this.getWidth()/2, this.getHeight()/2);
+                this.mPath.transform(matrix);
+            } else {
+                mPath.reset();
+            }
+            
+            reconstruct = false;
+        }
+        
+        canvas.drawPath(mPath, mPaint);
+        
+        Iterator<Path> it = debug.iterator();
+        while (it.hasNext()) {
+            Path path = it.next();
+            canvas.drawPath(path, mDebugPaint);
+        }
+    }
+    
+    public void clearDebugPath() {
+        debug.clear();
+    }
+    
+    public void addDebugPath(Path path) {
+        debug.add(path);
+    }
+    
+    public void addDebugPath(ArrayList<Path> paths) {
+        debug.addAll(paths);
+    }
+    
+    public void clear() {
+        mPath = new Path();
+        this.mCurrentGesture = null;
+        mCanvas.drawColor(background);
+        this.invalidate();
+    }
+    
+    private void convertFromStroke(Gesture stk) {
+        mPath = null;
+        Iterator it = stk.getPoints().iterator();
+        while (it.hasNext()) {
+            PointF p = (PointF) it.next();
+            if (mPath == null) {
+                mPath = new Path();
+                mPath.moveTo(p.x, p.y);
+                mX = p.x;
+                mY = p.y;
+            } else {
+                float dx = Math.abs(p.x - mX);
+                float dy = Math.abs(p.y - mY);
+                if (dx >= TOUCH_TOLERANCE || dy >= TOUCH_TOLERANCE) {
+                    mPath.quadTo(mX, mY, (p.x + mX)/2, (p.y + mY)/2);
+                    mX = p.x;
+                    mY = p.y;
+                }
+            }
+        }
+        mPath.lineTo(mX, mY);
+    }
+    
+    public void setEnableInput(boolean b) {
+        mEnableInput = b;
+    }
+    
+    public boolean isEnableInput() {
+        return mEnableInput;
+    }
+    
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+      
+        if(mEnableInput == false) 
+            return true;
+        
+        switch (event.getAction()) {
+            case MotionEvent.ACTION_DOWN:
+                touch_start(event);
+                invalidate();
+                break;
+            case MotionEvent.ACTION_MOVE:
+                touch_move(event);
+                invalidate();
+                break;
+            case MotionEvent.ACTION_UP:
+                touch_up(event);
+                invalidate();
+                break;
+        }
+        return true;
+    }
+    
+    private void touch_start(MotionEvent event) {
+        mIsFadingOut = false;
+        mHandler.removeCallbacks(mFadingOut);
+      
+        float x = event.getX();
+        float y = event.getY();
+
+        mCurrentGesture = new Gesture();
+        mCurrentGesture.addPoint(x, y);
+        
+        mPath.reset();
+        mPath.moveTo(x, y);
+        mX = x;
+        mY = y;
+        
+        Iterator<GestureListener> it = mGestureListeners.iterator();
+        while (it.hasNext()) {
+            it.next().onStartGesture(this, event);
+        }
+    }
+    
+    private void touch_move(MotionEvent event) {
+        float x = event.getX();
+        float y = event.getY();
+
+        float dx = Math.abs(x - mX);
+        float dy = Math.abs(y - mY);
+        if (dx >= TOUCH_TOLERANCE || dy >= TOUCH_TOLERANCE) {
+            mPath.quadTo(mX, mY, (x + mX)/2, (y + mY)/2);
+            mX = x;
+            mY = y;
+        }
+        
+        mCurrentGesture.addPoint(x, y);
+        
+        Iterator<GestureListener> it = mGestureListeners.iterator();
+        while (it.hasNext()) {
+            it.next().onGesture(this, event);
+        }
+    }
+    
+    public void setFadingOut(boolean b) {
+        mShouldFadingOut = b;
+        mIsFadingOut = false;
+    }
+    
+    public boolean shouldFadingOut() {
+        return mShouldFadingOut;
+    }
+    
+    private void touch_up(MotionEvent event) {
+        mPath.lineTo(mX, mY);
+        
+        if (mCacheGesture)
+            mCanvas.drawPath(mPath, mPaint);
+        
+        // kill this so we don't double draw
+        if (shouldFadingOut()) {
+            mFadingAlpha = 1;
+            mIsFadingOut = true;
+            mHandler.removeCallbacks(mFadingOut);
+            mHandler.postDelayed(mFadingOut, 100);
+        }
+        
+        Iterator<GestureListener> it = mGestureListeners.iterator();
+        while (it.hasNext()) {
+            it.next().onFinishGesture(this, event);
+        }
+    }
+
+}
diff --git a/tests/sketch/src/com/android/gesture/example/GestureEntryDemo.java b/tests/sketch/src/com/android/gesture/example/GestureEntryDemo.java
new file mode 100755
index 000000000000..8fee21ac490b
--- /dev/null
+++ b/tests/sketch/src/com/android/gesture/example/GestureEntryDemo.java
@@ -0,0 +1,220 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.gesture.example;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.EditText;
+import android.widget.Spinner;
+import android.widget.AdapterView.OnItemSelectedListener;
+
+import com.android.gesture.Gesture;
+import com.android.gesture.GestureLib;
+import com.android.gesture.GestureListener;
+import com.android.gesture.GesturePad;
+import com.android.gesture.R;
+import com.android.gesture.recognizer.Prediction;
+
+import java.util.ArrayList;
+
+/**
+ * The demo shows how to construct a gesture-based user interface on Android.
+ */
+
+public class GestureEntryDemo extends Activity {
+  
+    private static final int DIALOG_NEW_ENTRY = 1;
+    private static final int NEW_ID = Menu.FIRST;
+    private static final int VIEW_ID = Menu.FIRST + 1;
+
+    GesturePad  mView;
+    Spinner     mResult;
+    GestureLib  mRecognizer;
+    boolean     mChangedByRecognizer = false;
+    
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.demo);
+        
+        // init the recognizer
+        mRecognizer = new GestureLib("/sdcard/gestureentry");
+        mRecognizer.load();
+        
+        // create the spinner for showing the recognition results
+        // the spinner also allows a user to correct a prediction
+        mResult = (Spinner) findViewById(R.id.spinner);
+        mResult.setOnItemSelectedListener(new OnItemSelectedListener() {
+
+            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+                // TODO Auto-generated method stub
+                // correct the recognition result by adding the new example
+                if (mChangedByRecognizer == false) {
+                    mRecognizer.addGesture(parent.getSelectedItem().toString(), 
+                      mView.getCurrentGesture());
+                } else {
+                    mChangedByRecognizer = false;
+                }
+            }
+  
+            public void onNothingSelected(AdapterView<?> parent) {
+              // TODO Auto-generated method stub
+              
+            }
+          
+        });
+        
+        // create the area for drawing a gesture
+        mView = (GesturePad)this.findViewById(R.id.drawingpad);
+        mView.cacheGesture(false);
+        mView.setFadingOut(false);
+        mView.addGestureListener(new GestureListener() {
+            public void onFinishGesture(GesturePad patch, MotionEvent event) {
+                // TODO Auto-generated method stub
+                recognize(patch.getCurrentGesture());
+            }
+            public void onGesture(GesturePad patch, MotionEvent event) {
+              // TODO Auto-generated method stub
+              
+            }
+            public void onStartGesture(GesturePad patch, MotionEvent event) {
+              // TODO Auto-generated method stub
+              
+            }
+        });
+        
+        
+        if (savedInstanceState != null) {
+            mView.setCurrentGesture(
+                (Gesture)savedInstanceState.getParcelable("gesture"));
+        }
+    }
+    
+    @Override
+    protected Dialog onCreateDialog(int id) {
+        // create the dialog for adding a new entry
+        LayoutInflater factory = LayoutInflater.from(this);
+        final View textEntryView =
+             factory.inflate(R.layout.newgesture_dialog, null);
+        return new AlertDialog.Builder(GestureEntryDemo.this)
+            .setTitle(R.string.newgesture_text_entry)
+            .setView(textEntryView)
+            .setPositiveButton(R.string.newgesture_dialog_ok, 
+                new DialogInterface.OnClickListener() {
+                public void onClick(DialogInterface dialog, int whichButton) {
+                    /* User clicked OK so do some stuff */
+                    EditText edittext =
+                      (EditText)((AlertDialog)dialog).findViewById(R.id.gesturename_edit);
+                    String text = edittext.getText().toString().trim();
+                    if (text.length() > 0) {
+                        mRecognizer.addGesture(text, mView.getCurrentGesture());
+                    }
+                }
+            })
+            .setNegativeButton(R.string.newgesture_dialog_cancel,
+                new DialogInterface.OnClickListener() {
+                public void onClick(DialogInterface dialog, int whichButton) {
+                    /* User clicked cancel so do some stuff */
+                }
+            })
+            .create();
+    }
+    
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        // TODO Auto-generated method stub
+        super.onCreateOptionsMenu(menu);
+        menu.add(0, NEW_ID, 0, R.string.newgesture)
+                .setShortcut('0', 'n')
+                .setIcon(android.R.drawable.ic_menu_add);
+        menu.add(0, VIEW_ID, 0, R.string.viewgesture)
+                .setShortcut('1', 'v')
+                .setIcon(android.R.drawable.ic_menu_view);
+        return true;
+    }
+    
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        // Handle all of the possible menu actions.
+        switch (item.getItemId()) {
+            case NEW_ID:
+                // if there has been a gesture on the canvas
+                if (mView.getCurrentGesture() != null) {
+                    showDialog(DIALOG_NEW_ENTRY);
+                }
+                break;
+                
+            case VIEW_ID:
+                startActivityForResult(
+                    new Intent(this, GestureLibViewer.class), VIEW_ID);
+                break;
+        }
+        
+        return super.onOptionsItemSelected(item);
+    }
+    
+    
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        mRecognizer.load();
+        mView.clear();
+    }
+    
+    @Override
+    protected void onPause() {
+        // TODO Auto-generated method stub
+        super.onPause();
+        mRecognizer.save();
+    }
+    
+    
+    @Override
+    protected void onPrepareDialog(int id, Dialog dialog) {
+        // TODO Auto-generated method stub
+        super.onPrepareDialog(id, dialog);
+    }
+
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        // TODO Auto-generated method stub
+        super.onSaveInstanceState(outState);
+        outState.putParcelable("gesture", mView.getCurrentGesture());
+        mRecognizer.save();
+    }
+
+    public void recognize(Gesture ink) {
+        mChangedByRecognizer = true;
+        ArrayList<Prediction> predictions = mRecognizer.recognize(ink);
+        ArrayAdapter adapter = new ArrayAdapter(this, 
+                    android.R.layout.simple_spinner_item, predictions);
+        adapter.setDropDownViewResource(
+                    android.R.layout.simple_spinner_dropdown_item);
+        mResult.setAdapter(adapter);
+    }
+
+}
diff --git a/tests/sketch/src/com/android/gesture/example/GestureLibViewer.java b/tests/sketch/src/com/android/gesture/example/GestureLibViewer.java
new file mode 100755
index 000000000000..7ae7fc5e84d3
--- /dev/null
+++ b/tests/sketch/src/com/android/gesture/example/GestureLibViewer.java
@@ -0,0 +1,257 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.gesture.example;
+
+import android.app.Activity;
+import android.graphics.Matrix;
+import android.graphics.Path;
+import android.os.Bundle;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.Spinner;
+import android.widget.AdapterView.OnItemSelectedListener;
+
+import com.android.gesture.Gesture;
+import com.android.gesture.GestureLib;
+import com.android.gesture.GesturePad;
+import com.android.gesture.R;
+import com.android.gesture.recognizer.Instance;
+
+import java.util.ArrayList;
+import java.util.Collections;
+
+/**
+ * GestureLibViewer is for viewing existing gestures and 
+ * removing unwanted gestures.
+ */
+
+public class GestureLibViewer  extends Activity {
+  
+    GesturePad          mView;
+    Spinner             mResult;
+    GestureLib          mRecognizer;
+    ArrayList<Gesture>  mSamples;
+    int                 mCurrentGestureIndex;
+    
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.gestureviewer);
+        
+        // create the area for drawing a glyph
+        mView = (GesturePad)this.findViewById(R.id.drawingpad);
+        mView.cacheGesture(false);
+        mView.setFadingOut(false);
+        mView.setEnableInput(false);
+        
+        // init the recognizer
+        mRecognizer = new GestureLib("/sdcard/gestureentry");
+        mRecognizer.load();
+
+        mResult = (Spinner) findViewById(R.id.spinner);
+        ArrayList<String> list = new ArrayList<String>();
+        list.addAll(mRecognizer.getLabels());
+        Collections.sort(list);
+        ArrayAdapter<String> adapter = new ArrayAdapter<String>(this, 
+                    android.R.layout.simple_spinner_item, 
+                    list);
+        adapter.setDropDownViewResource(
+                    android.R.layout.simple_spinner_dropdown_item);
+        mResult.setAdapter(adapter);
+        mSamples = mRecognizer.getGestures(list.get(0));
+        if (mSamples.isEmpty() == false) {
+            mCurrentGestureIndex = 0;
+            Gesture gesture = mSamples.get(mCurrentGestureIndex);
+            mView.setCurrentGesture(gesture);
+            mView.clearDebugPath();
+            mView.addDebugPath(
+                toPath(mRecognizer.getClassifier().getInstance(gesture.getID())));
+        }
+        
+        mResult.setOnItemSelectedListener(new OnItemSelectedListener() {
+            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+                // TODO Auto-generated method stub
+                mSamples = mRecognizer.getGestures(
+                    (String)mResult.getSelectedItem());
+                if (mSamples.isEmpty() == false) {
+                    mCurrentGestureIndex = 0;
+                    Gesture gesture = mSamples.get(mCurrentGestureIndex);
+                    mView.setCurrentGesture(gesture);
+                    mView.clearDebugPath();
+                    mView.addDebugPath(
+                        toPath(mRecognizer.getClassifier().getInstance(gesture.getID())));
+                }
+                mView.invalidate();
+            }
+  
+            public void onNothingSelected(AdapterView<?> parent) {
+              // TODO Auto-generated method stub
+              
+            }
+          
+        });
+        
+        Button remove = (Button)this.findViewById(R.id.remove);
+        remove.setOnClickListener(new OnClickListener() {
+            public void onClick(View v) {
+                // TODO Auto-generated method stub
+                if (mSamples.isEmpty())
+                    return;
+                
+                String name = (String)mResult.getSelectedItem();
+                Gesture gesture = mSamples.get(mCurrentGestureIndex);
+                mRecognizer.removeGesture(name, gesture);
+                
+                mSamples = mRecognizer.getGestures(name);
+                
+                if (mSamples == null) {
+                    // delete the entire entry
+                    mCurrentGestureIndex = 0;
+                    ArrayList<String> list = new ArrayList<String>();
+                    list.addAll(mRecognizer.getLabels());
+                    Collections.sort(list);
+                    ArrayAdapter<String> adapter = new ArrayAdapter<String>(
+                                GestureLibViewer.this, 
+                                android.R.layout.simple_spinner_item, 
+                                list);
+                    adapter.setDropDownViewResource(
+                                android.R.layout.simple_spinner_dropdown_item);
+                    mResult.setAdapter(adapter);
+                } else {
+                    if (mCurrentGestureIndex > mSamples.size()-1) {
+                        mCurrentGestureIndex--;
+                    }
+                    gesture = mSamples.get(mCurrentGestureIndex);
+                    mView.setCurrentGesture(gesture);
+                    mView.clearDebugPath();
+                    mView.addDebugPath(
+                        toPath(mRecognizer.getClassifier().getInstance(gesture.getID())));
+                    mView.invalidate();
+                }
+            }
+        });
+        
+        Button next = (Button)this.findViewById(R.id.next);
+        next.setOnClickListener(new OnClickListener() {
+            public void onClick(View v) {
+                // TODO Auto-generated method stub
+                if (mCurrentGestureIndex >= mSamples.size()-1)
+                    return;
+                
+                mCurrentGestureIndex++;
+                Gesture gesture = mSamples.get(mCurrentGestureIndex);
+                mView.setCurrentGesture(gesture);
+                mView.clearDebugPath();
+                mView.addDebugPath(
+                    toPath(mRecognizer.getClassifier().getInstance(gesture.getID())));
+                mView.invalidate();
+            }
+        });
+
+        Button previous = (Button)this.findViewById(R.id.previous);
+        previous.setOnClickListener(new OnClickListener() {
+            public void onClick(View v) {
+                // TODO Auto-generated method stub
+                if (mCurrentGestureIndex >= 1 &&
+                    mSamples.isEmpty() == false) {
+                    mCurrentGestureIndex--;
+                    Gesture gesture = mSamples.get(mCurrentGestureIndex);
+                    mView.setCurrentGesture(gesture);
+                    mView.clearDebugPath();
+                    mView.addDebugPath(
+                        toPath(mRecognizer.getClassifier().getInstance(gesture.getID())));
+                    mView.invalidate();
+                }
+            }
+        });
+    }
+    
+    public static ArrayList<Path> toPath(Instance instance) {
+        ArrayList<Path> paths = new ArrayList();
+        Path path = null;
+        float minx = 0, miny = 0;
+        float mX = 0, mY = 0;
+        for (int i=0; i<instance.vector.length; i+=2) {
+            float x = instance.vector[i];
+            float y = instance.vector[i+1];
+            if (x < minx)
+                minx = x;
+            if (y < miny)
+                miny = y;
+            if (path == null) {
+              path = new Path();
+              path.moveTo(x, y);
+              mX = x;
+              mY = y;
+            } else {
+              float dx = Math.abs(x - mX);
+              float dy = Math.abs(y - mY);
+              if (dx >= 3 || dy >= 3) {
+                  path.quadTo(mX, mY, (x + mX)/2, (y + mY)/2);
+                  mX = x;
+                  mY = y;
+              }
+            }
+        }
+        Matrix matrix = new Matrix();
+        matrix.setTranslate(-minx + 10, -miny + 10);
+        path.transform(matrix);
+        paths.add(path);
+        
+        path = new Path();
+        path.moveTo(instance.vector[0]-5, instance.vector[1]-5);
+        path.lineTo(instance.vector[0]-5, instance.vector[1]+5);
+        path.lineTo(instance.vector[0]+5, instance.vector[1]+5);
+        path.lineTo(instance.vector[0]+5, instance.vector[1]-5);
+        path.close();
+        path.transform(matrix);
+        paths.add(path);
+        
+        return paths;
+    }
+    
+    @Override
+    public boolean onKeyUp(int keyCode, KeyEvent event) {
+      // TODO Auto-generated method stub
+      if (keyCode == KeyEvent.KEYCODE_BACK) {
+          mRecognizer.save();
+          this.setResult(RESULT_OK);
+          finish();
+          return true;
+      }
+      else
+        return false;
+    }
+    
+    @Override
+    protected void onPause() {
+        // TODO Auto-generated method stub
+        super.onPause();
+        mRecognizer.save();
+    }
+
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        // TODO Auto-generated method stub
+        super.onSaveInstanceState(outState);
+        mRecognizer.save();
+    }
+}
diff --git a/tests/sketch/src/com/android/gesture/recognizer/Classifier.java b/tests/sketch/src/com/android/gesture/recognizer/Classifier.java
new file mode 100755
index 000000000000..584e0a5e77ee
--- /dev/null
+++ b/tests/sketch/src/com/android/gesture/recognizer/Classifier.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.gesture.recognizer;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
+/**
+ * The abstract class of Classifier
+ */
+public abstract class Classifier {
+	
+	HashMap<Long, Instance> mInstances = new HashMap<Long, Instance>();
+	
+	public void addInstance(Instance instance) {
+		mInstances.put(instance.id, instance);
+	}
+	
+	public Instance getInstance(long id) {
+	    return mInstances.get(id);
+	}
+	
+	public void removeInstance(long id) {
+	    mInstances.remove(id);
+	}
+	
+	public abstract ArrayList<Prediction> classify(Instance instance);
+}
diff --git a/tests/sketch/src/com/android/gesture/recognizer/Instance.java b/tests/sketch/src/com/android/gesture/recognizer/Instance.java
new file mode 100755
index 000000000000..2eaa1c232eb8
--- /dev/null
+++ b/tests/sketch/src/com/android/gesture/recognizer/Instance.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package com.android.gesture.recognizer;
+
+import android.graphics.PointF;
+
+import com.android.gesture.Gesture;
+
+/**
+ * An instance represents a sample if the label is available or a query if
+ * the label is null.
+ */
+public class Instance {
+
+    private final static float[] targetOrientations = {
+        0, 45, 90, 135, 180, -0, -45, -90, -135, -180
+    };
+    
+    // the feature vector
+    public final float[] vector;
+    // the label can be null
+	public final String	label;
+	// the length of the vector
+	public final float length;
+	// the id of the instance
+	public final long id;
+
+	Instance(long d, float[] v, String l) {
+		id = d;
+		vector = v;
+		label = l;
+		float sum = 0;
+		for (int i = 0; i < vector.length; i++) {
+			sum += vector[i] * vector[i];
+		}
+		length = (float)Math.sqrt(sum);
+	}
+	
+    public static Instance createInstance(Gesture gesture, String label) {
+        float[] pts = RecognitionUtil.resample(gesture, 64);
+        PointF center = RecognitionUtil.computeCentroid(pts);
+        float inductiveOrientation = (float)Math.atan2(pts[1] - center.y, 
+                pts[0] - center.x);
+        inductiveOrientation *= 180 / Math.PI;
+        
+        float minDeviation = Float.MAX_VALUE;
+        for (int i=0; i<targetOrientations.length; i++) {
+            float delta = targetOrientations[i] - inductiveOrientation;
+            if (Math.abs(delta) < Math.abs(minDeviation)) {
+                minDeviation = delta;
+            }
+        }
+        
+        android.graphics.Matrix m = new android.graphics.Matrix();
+        m.setTranslate(-center.x, -center.y);
+        android.graphics.Matrix rotation = new android.graphics.Matrix();
+        rotation.setRotate(minDeviation);
+        m.postConcat(rotation);
+        m.mapPoints(pts);
+
+        return new Instance(gesture.getID(), pts, label);
+    }
+}
diff --git a/tests/sketch/src/com/android/gesture/recognizer/NearestNeighbor.java b/tests/sketch/src/com/android/gesture/recognizer/NearestNeighbor.java
new file mode 100755
index 000000000000..cb8a9d30bb3a
--- /dev/null
+++ b/tests/sketch/src/com/android/gesture/recognizer/NearestNeighbor.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.gesture.recognizer;
+
+import android.util.Log;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.TreeMap;
+
+public class NearestNeighbor extends Classifier {
+  
+    private static final String LOGTAG = "NearestNeighbor";
+    private static final double variance = 0.25; // std = 0.5
+    
+    public ArrayList<Prediction> classify(Instance instance) {
+    
+        ArrayList<Prediction> list = new ArrayList<Prediction>();
+        Iterator<Instance> it = mInstances.values().iterator();
+        Log.v(LOGTAG, mInstances.size() + " instances found");
+        TreeMap<String, Double> label2score = new TreeMap<String, Double>();
+        while (it.hasNext()) {
+            Instance sample = it.next();
+            double dis = RecognitionUtil.cosineDistance(sample, instance);
+            double weight = Math.exp(-dis*dis/(2 * variance));
+            Log.v(LOGTAG, sample.label + " = " + dis + " weight = " + weight);
+            Double score = label2score.get(sample.label);
+            if (score == null) {
+                score = weight;
+            }
+            else {
+                score += weight;
+            }
+            label2score.put(sample.label, score);
+        }
+        
+        double sum = 0;
+        Iterator it2 = label2score.keySet().iterator();
+        while (it2.hasNext()) {
+            String name = (String)it2.next();
+            double score = label2score.get(name);
+            sum += score;
+            list.add(new Prediction(name, score));
+        }
+        
+        it2 = list.iterator();
+        while (it2.hasNext()) {
+            Prediction name = (Prediction)it2.next();
+            name.score /= sum;
+        }
+    
+        
+        Collections.sort(list, new Comparator<Prediction>() {
+            public int compare(Prediction object1, Prediction object2) {
+                // TODO Auto-generated method stub
+                double score1 = object1.score;
+                double score2 = object2.score;
+                if (score1 > score2)
+                    return -1;
+                else if (score1 < score2)
+                    return 1;
+                else
+                    return 0;
+            }
+        });
+        
+        it2 = list.iterator();
+        while (it2.hasNext()) {
+            Prediction name = (Prediction)it2.next();
+            Log.v(LOGTAG, "prediction [" + name.label + " = " + name.score + "]");
+        }
+        
+        return list;
+    }
+}
diff --git a/tests/sketch/src/com/android/gesture/recognizer/Prediction.java b/tests/sketch/src/com/android/gesture/recognizer/Prediction.java
new file mode 100755
index 000000000000..c3187549a23d
--- /dev/null
+++ b/tests/sketch/src/com/android/gesture/recognizer/Prediction.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.gesture.recognizer;
+
+/**
+ * 
+ * A recognition result that includes the label and its score
+ */
+public class Prediction {
+	public final String label;
+	public double score;
+	
+	public Prediction(String l, double s) {
+		label = l;
+		score = s;
+	}
+	
+	@Override
+    public String toString() {
+	    return label;
+	}
+}
diff --git a/tests/sketch/src/com/android/gesture/recognizer/RecognitionUtil.java b/tests/sketch/src/com/android/gesture/recognizer/RecognitionUtil.java
new file mode 100755
index 000000000000..9146b9539892
--- /dev/null
+++ b/tests/sketch/src/com/android/gesture/recognizer/RecognitionUtil.java
@@ -0,0 +1,190 @@
+/*
+ * Copyright (C) 2008-2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.gesture.recognizer;
+
+import android.graphics.PointF;
+
+import com.android.gesture.Gesture;
+
+import java.util.Iterator;
+
+/**
+ * 
+ * Utilities for recognition.
+ */
+
+public class RecognitionUtil {
+  
+    /**
+     * Re-sample a list of points to a given number
+     * @param stk
+     * @param num
+     * @return
+     */
+    public static float[] resample(Gesture gesture, int num) {
+        final float increment = gesture.getLength()/(num - 1);
+        float[] newstk = new float[num*2];
+        float distanceSoFar = 0;
+        Iterator<PointF> it = gesture.getPoints().iterator();
+        PointF lstPoint = it.next();
+        int index = 0;
+        PointF currentPoint = null;
+        try
+        {
+            newstk[index] = lstPoint.x;
+            index++;
+            newstk[index] = lstPoint.y;
+            index++;
+            while (it.hasNext()) {
+                if (currentPoint == null)
+                    currentPoint = it.next();
+                float deltaX = currentPoint.x - lstPoint.x;
+                float deltaY = currentPoint.y - lstPoint.y;
+                float distance = (float)Math.sqrt(deltaX*deltaX+deltaY*deltaY);
+                if (distanceSoFar+distance >= increment) {
+                    float ratio = (increment - distanceSoFar) / distance;
+                    float nx = lstPoint.x + ratio * deltaX;
+                    float ny = lstPoint.y + ratio * deltaY;
+                    newstk[index] = nx;
+                    index++;
+                    newstk[index] = ny;
+                    index++;
+                    lstPoint = new PointF(nx, ny);
+                    distanceSoFar = 0;
+                }
+                else {
+                    lstPoint = currentPoint;
+                    currentPoint = null;
+                    distanceSoFar += distance;
+                }
+            }
+        }
+        catch(Exception ex) {
+            ex.printStackTrace();
+        }
+    
+        for(int i = index; i < newstk.length -1; i+=2) {
+            newstk[i] = lstPoint.x;
+            newstk[i+1] = lstPoint.y;
+        }
+        return newstk;
+    }
+
+    /**
+     * Calculate the centroid of a list of points
+     * @param points
+     * @return the centroid
+     */
+    public static PointF computeCentroid(float[] points) {
+        float centerX = 0;
+        float centerY = 0;
+        for(int i=0; i<points.length; i++)
+        {
+            centerX += points[i];
+            i++;
+            centerY += points[i];
+        }
+        centerX = 2 * centerX/points.length;
+        centerY = 2 * centerY/points.length;
+        return new PointF(centerX, centerY);
+    }
+
+    /**
+     * calculate the variance-covariance matrix, treat each point as a sample
+     * @param points
+     * @return
+     */
+    public static double[][] computeCoVariance(float[] points) {
+        double[][] array = new double[2][2];
+        array[0][0] = 0;
+        array[0][1] = 0;
+        array[1][0] = 0;
+        array[1][1] = 0;
+        for(int i=0; i<points.length; i++)
+        {
+            float x = points[i];
+            i++;
+            float y = points[i];
+            array[0][0] += x * x;
+            array[0][1] += x * y;
+            array[1][0] = array[0][1];
+            array[1][1] += y * y;
+        }
+        array[0][0] /= (points.length/2);
+        array[0][1] /= (points.length/2);
+        array[1][0] /= (points.length/2);
+        array[1][1] /= (points.length/2);
+        
+        return array;
+    }
+    
+
+    public static float computeTotalLength(float[] points) {
+        float sum = 0;
+        for (int i=0; i<points.length - 4; i+=2) {
+            float dx = points[i+2] - points[i];
+            float dy = points[i+3] - points[i+1];
+            sum += Math.sqrt(dx*dx + dy*dy);
+        }
+        return sum;
+    }
+    
+    public static double computeStraightness(float[] points) {
+        float totalLen = computeTotalLength(points);
+        float dx = points[2] - points[0];
+        float dy = points[3] - points[1];
+        return Math.sqrt(dx*dx + dy*dy) / totalLen;
+    }
+
+    public static double computeStraightness(float[] points, float totalLen) {
+        float dx = points[2] - points[0];
+        float dy = points[3] - points[1];
+        return Math.sqrt(dx*dx + dy*dy) / totalLen;
+    }
+
+    public static double averageEuclidDistance(float[] stk1, float[] stk2) {
+        double distance = 0;
+        for (int i = 0; i < stk1.length; i += 2) {
+            distance += PointF.length(stk1[i] - stk2[i], stk1[i+1] - stk2[i+1]);
+        }
+        return distance/stk1.length;
+    }
+    
+    public static double squaredEuclidDistance(float[] stk1, float[] stk2) {
+        double squaredDistance = 0;
+        for (int i = 0; i < stk1.length; i++) {
+            float difference = stk1[i] - stk2[i];
+            squaredDistance += difference * difference;
+        }
+        return squaredDistance/stk1.length;
+    }
+    
+    /**
+     * Calculate the cosine distance between two instances
+     * @param in1
+     * @param in2
+     * @return the angle between 0 and Math.PI
+     */
+    public static double cosineDistance(Instance in1, Instance in2) {
+        float sum = 0;
+        for (int i = 0; i < in1.vector.length; i++) {
+            sum += in1.vector[i] * in2.vector[i];
+        }
+        return Math.acos(sum / (in1.length * in2.length));
+    }
+
+}
diff --git a/tools/aapt/AaptAssets.h b/tools/aapt/AaptAssets.h
index 01c8140b25ce..2ef0347c2d45 100644
--- a/tools/aapt/AaptAssets.h
+++ b/tools/aapt/AaptAssets.h
@@ -125,7 +125,9 @@ public:
         {
             //printf("new AaptFile created %s\n", (const char*)sourceFile);
         }
-    virtual ~AaptFile() { }
+    virtual ~AaptFile() {
+        free(mData);
+    }
 
     const String8& getPath() const { return mPath; }
     const AaptGroupEntry& getGroupEntry() const { return mGroupEntry; }
@@ -441,7 +443,13 @@ private:
     AaptSymbolEntry                                 mDefSymbol;
 };
 
-class ResourceTypeSet;
+class ResourceTypeSet : public RefBase,
+                        public KeyedVector<String8,sp<AaptGroup> >
+{
+public:
+    ResourceTypeSet();
+};
+
 
 /**
  * Asset hierarchy being operated on.
@@ -449,8 +457,8 @@ class ResourceTypeSet;
 class AaptAssets : public AaptDir
 {
 public:
-    AaptAssets() : AaptDir(String8(), String8()), mHaveIncludedAssets(false) { }
-    virtual ~AaptAssets() { }
+    AaptAssets() : AaptDir(String8(), String8()), mHaveIncludedAssets(false), mRes(NULL) { }
+    virtual ~AaptAssets() { delete mRes; }
 
     const String8& getPackage() const { return mPackage; }
     void setPackage(const String8& package) { mPackage = package; mSymbolsPrivatePackage = package; }
@@ -498,7 +506,7 @@ public:
     
     inline KeyedVector<String8, sp<ResourceTypeSet> >* getResources() { return mRes; }
     inline void 
-        setResources(KeyedVector<String8, sp<ResourceTypeSet> >* res) { mRes = res; }
+        setResources(KeyedVector<String8, sp<ResourceTypeSet> >* res) { delete mRes; mRes = res; }
 
 private:
     String8 mPackage;
diff --git a/tools/aapt/Images.cpp b/tools/aapt/Images.cpp
index 0a4c68ba2e32..f2414dd85487 100644
--- a/tools/aapt/Images.cpp
+++ b/tools/aapt/Images.cpp
@@ -44,6 +44,9 @@ struct image_info
             }
             free(allocRows);
         }
+        free(info9Patch.xDivs);
+        free(info9Patch.yDivs);
+        free(info9Patch.colors);
     }
 
     png_uint_32 width;
@@ -833,6 +836,7 @@ static void write_png(const char* imageName,
     int i;
 
     png_unknown_chunk unknowns[1];
+    unknowns[0].data = NULL;
 
     png_bytepp outRows = (png_bytepp) malloc((int) imageInfo.height * png_sizeof(png_bytep));
     if (outRows == (png_bytepp) 0) {
@@ -939,6 +943,7 @@ static void write_png(const char* imageName,
         free(outRows[i]);
     }
     free(outRows);
+    free(unknowns[0].data);
 
     png_get_IHDR(write_ptr, write_info, &width, &height,
        &bit_depth, &color_type, &interlace_type,
diff --git a/tools/aapt/Resource.cpp b/tools/aapt/Resource.cpp
index b2bd9ffc35ec..2e4d0a4747c6 100644
--- a/tools/aapt/Resource.cpp
+++ b/tools/aapt/Resource.cpp
@@ -45,13 +45,6 @@ static String8 parseResourceName(const String8& leaf)
     }
 }
 
-class ResourceTypeSet : public RefBase,
-                        public KeyedVector<String8,sp<AaptGroup> >
-{
-public:
-    ResourceTypeSet();
-};
-
 ResourceTypeSet::ResourceTypeSet()
     :RefBase(),
      KeyedVector<String8,sp<AaptGroup> >()
@@ -1055,6 +1048,7 @@ status_t buildResources(Bundle* bundle, const sp<AaptAssets>& assets)
                 printf("  Writing public definitions to %s.\n", bundle->getPublicOutputFile());
             }
             table.writePublicDefinitions(String16(assets->getPackage()), fp);
+            fclose(fp);
         }
 
         NOISY(
@@ -1072,7 +1066,6 @@ status_t buildResources(Bundle* bundle, const sp<AaptAssets>& assets)
             return err;
         }
     }
-
     return err;
 }
 
diff --git a/tools/aapt/XMLNode.cpp b/tools/aapt/XMLNode.cpp
index d4765672274e..50a21857462c 100644
--- a/tools/aapt/XMLNode.cpp
+++ b/tools/aapt/XMLNode.cpp
@@ -486,6 +486,7 @@ XMLNode::XMLNode(const String8& filename, const String16& s1, const String16& s2
 XMLNode::XMLNode(const String8& filename)
     : mFilename(filename)
 {
+    memset(&mCharsValue, 0, sizeof(mCharsValue));
 }
 
 XMLNode::type XMLNode::getType() const
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeCanvas.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeCanvas.java
index 70c26a7ee7f0..47106912e467 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeCanvas.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeCanvas.java
@@ -650,12 +650,12 @@ public class BridgeCanvas extends Canvas {
         int arcHeight = (int)(ry * 2);
         
         if (style == Style.FILL || style == Style.FILL_AND_STROKE) {
-            g.fillRoundRect((int)rect.left, (int)rect.right, (int)rect.width(), (int)rect.height(),
+            g.fillRoundRect((int)rect.left, (int)rect.top, (int)rect.width(), (int)rect.height(),
                     arcWidth, arcHeight);
         }
 
         if (style == Style.STROKE || style == Style.FILL_AND_STROKE) {
-            g.drawRoundRect((int)rect.left, (int)rect.right, (int)rect.width(), (int)rect.height(),
+            g.drawRoundRect((int)rect.left, (int)rect.top, (int)rect.width(), (int)rect.height(),
                     arcWidth, arcHeight);
         }