am d773bbd7: am 94dab9b1: fix broken api/current.xml

Merge commit 'd773bbd785aee50c84fe780031c5c796d4ddec9f'

* commit 'd773bbd785aee50c84fe780031c5c796d4ddec9f':
  fix broken api/current.xml
This commit is contained in:
Vasu Nori
2010-07-17 19:25:56 -07:00
committed by Android Git Automerger

View File

@@ -135869,50 +135869,6 @@
visibility="public"
>
</field>
<field name="CAPABILITY_HAS_CAMERA"
type="int"
transient="false"
volatile="false"
value="4"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="CAPABILITY_HAS_VIDEO_PLAYBACK_ONLY"
type="int"
transient="false"
volatile="false"
value="1"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="CAPABILITY_HAS_VOICE"
type="int"
transient="false"
volatile="false"
value="2"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="CHAT_CAPABILITY"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;chat_capability&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="DO_NOT_DISTURB"
type="int"
transient="false"
@@ -140296,6 +140252,50 @@
visibility="public"
>
</field>
<field name="CAPABILITY_HAS_CAMERA"
type="int"
transient="false"
volatile="false"
value="4"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="CAPABILITY_HAS_VIDEO_PLAYBACK_ONLY"
type="int"
transient="false"
volatile="false"
value="1"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="CAPABILITY_HAS_VOICE"
type="int"
transient="false"
volatile="false"
value="2"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="CHAT_CAPABILITY"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;chat_capability&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="DO_NOT_DISTURB"
type="int"
transient="false"