Merge "Fix the build." into gingerbread

api/current.xml

@@ -85352,36 +85352,6 @@
  visibility="public"
 >
 </field>
-<field name="mControlChangeStatusListener"
- type="android.media.AudioEffect.OnControlStatusChangeListener"
- transient="false"
- volatile="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="mEnableStatusChangeListener"
- type="android.media.AudioEffect.OnEnableStatusChangeListener"
- transient="false"
- volatile="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="mId"
- type="int"
- transient="false"
- volatile="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
 <field name="mListenerLock"
  type="java.lang.Object"
  transient="false"
@@ -85402,36 +85372,6 @@
  visibility="public"
 >
 </field>
-<field name="mParameterChangeListener"
- type="android.media.AudioEffect.OnParameterChangeListener"
- transient="false"
- volatile="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="mState"
- type="int"
- transient="false"
- volatile="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="mStateLock"
- type="java.lang.Object"
- transient="false"
- volatile="false"
- static="false"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
 </class>
 <class name="AudioEffect.Descriptor"
  extends="java.lang.Object"