diff options
| author | Daniel Sandler <dsandler@android.com> | 2010-07-09 09:20:27 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-09 09:20:27 -0700 |
| commit | dce7cf98317e0de584b484df00f5ea8a822b0f53 (patch) | |
| tree | e30a2aa5252032f06b909e39687e99e863319a38 /api/current.xml | |
| parent | 5fe0ae8c2033a8ce6dc2add1394ef77dafe7b1ad (diff) | |
| parent | 339716e03c293c1ab29492e38936643f08d797fa (diff) | |
| download | frameworks_base-dce7cf98317e0de584b484df00f5ea8a822b0f53.zip frameworks_base-dce7cf98317e0de584b484df00f5ea8a822b0f53.tar.gz frameworks_base-dce7cf98317e0de584b484df00f5ea8a822b0f53.tar.bz2 | |
am 339716e0: am f99e27da: Merge "Make android:immersive public." into gingerbread
Merge commit '339716e03c293c1ab29492e38936643f08d797fa'
* commit '339716e03c293c1ab29492e38936643f08d797fa':
Make android:immersive public.
Diffstat (limited to 'api/current.xml')
| -rw-r--r-- | api/current.xml | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/api/current.xml b/api/current.xml index d85282b..16de702 100644 --- a/api/current.xml +++ b/api/current.xml @@ -4893,6 +4893,17 @@ visibility="public" > </field> +<field name="immersive" + type="int" + transient="false" + volatile="false" + value="16843457" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="inAnimation" type="int" transient="false" @@ -6092,17 +6103,6 @@ visibility="public" > </field> -<field name="kraken_resource_pad64" - type="int" - transient="false" - volatile="false" - value="16843457" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> <field name="kraken_resource_pad7" type="int" transient="false" |