Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 22650 into eclair

Browse Source 
* changes:
  Fix build break - Introduced in 22109
This commit is contained in:
Android (Google) Code Review
2009-08-25 14:55:27 -07:00
parent cf207b6325 fa5382208b
commit 1e09e9e0d0
1 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
api/current.xml
View File

@@ -118540,19 +118540,6 @@
>
</constructor>
<method name="addTestListener"
return="void"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="deprecated"
visibility="public"
>
<parameter name="instrumentation" type="android.app.Instrumentation">
</parameter>
</method>
<method name="setInstrumentation"
return="void"
abstract="false"
native="false"
@@ -118671,6 +118658,19 @@
</parameter>
</method>
<method name="setInstrumentaiton"
return="void"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="deprecated"
visibility="public"
>
<parameter name="instrumentation" type="android.app.Instrumentation">
</parameter>
</method>
<method name="setInstrumentation"
return="void"
abstract="false"
native="false"
@@ -118802,19 +118802,6 @@
synchronized="false"
static="false"
final="false"
deprecated="deprecated"
visibility="public"
>
<parameter name="instrumentation" type="android.app.Instrumentation">
</parameter>
</method>
<method name="injectInstrumentation"
return="void"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
@@ -118933,6 +118920,19 @@
>
</method>
<method name="injectInsrumentation"
return="void"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="deprecated"
visibility="public"
>
<parameter name="instrumentation" type="android.app.Instrumentation">
</parameter>
</method>
<method name="injectInstrumentation"
return="void"
abstract="false"
native="false"
@@ -264098,7 +264098,7 @@
</parameter>
<parameter name="buffer" type="java.lang.StringBuffer">
</parameter>
<parameter name="field" type="java.text.FieldPosition">
<parameter name="fieldPos" type="java.text.FieldPosition">
</parameter>
</method>
<method name="get2DigitYearStart"