am 1e09e9e0: Merge change 22650 into eclair

Merge commit '1e09e9e0d09602ee84a299f09b451db686ff6c40' into eclair-plus-aosp

* commit '1e09e9e0d09602ee84a299f09b451db686ff6c40':
  Fix build break

api/current.xml

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