diff options
| author | Vasu Nori <vnori@google.com> | 2010-07-17 19:25:56 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-17 19:25:56 -0700 |
| commit | fc6ed67f0a306a12f382a46ac7294c2c24a034a0 (patch) | |
| tree | 17ebf982b3b2505ac83702147a8e35dbaa99eda3 | |
| parent | df4606962788de5903a565e68a1a37590d0ab76b (diff) | |
| parent | d773bbd785aee50c84fe780031c5c796d4ddec9f (diff) | |
| download | frameworks_base-fc6ed67f0a306a12f382a46ac7294c2c24a034a0.zip frameworks_base-fc6ed67f0a306a12f382a46ac7294c2c24a034a0.tar.gz frameworks_base-fc6ed67f0a306a12f382a46ac7294c2c24a034a0.tar.bz2 | |
am d773bbd7: am 94dab9b1: fix broken api/current.xml
Merge commit 'd773bbd785aee50c84fe780031c5c796d4ddec9f'
* commit 'd773bbd785aee50c84fe780031c5c796d4ddec9f':
fix broken api/current.xml
| -rw-r--r-- | api/current.xml | 88 |
1 files changed, 44 insertions, 44 deletions
diff --git a/api/current.xml b/api/current.xml index a9b9bad..b5435e4 100644 --- a/api/current.xml +++ b/api/current.xml @@ -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=""chat_capability"" - 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=""chat_capability"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="DO_NOT_DISTURB" type="int" transient="false" |