Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 4f8c2f26: Fix docs build.

Browse Source 
Merge commit '4f8c2f26bfd9de8c8a31369dbedd415c7d6d9699' into gingerbread-plus-aosp

* commit '4f8c2f26bfd9de8c8a31369dbedd415c7d6d9699':
  Fix docs build.
This commit is contained in:
Dianne Hackborn
2010-08-27 16:18:09 -07:00
committed by Android Git Automerger
parent d71021cb30 4f8c2f26bf
commit 8da20dd037
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
api/current.xml
View File

@@ -4710,7 +4710,7 @@
type="int" type="int"
transient="false" transient="false"
volatile="false" volatile="false"
value="16843457" value="16843456"
static="true" static="true"
final="true" final="true"
deprecated="not deprecated" deprecated="not deprecated"
@@ -5916,6 +5916,17 @@
visibility="public" visibility="public"
> >
</field> </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" <field name="kraken_resource_pad7"
type="int" type="int"
transient="false" transient="false"

3
core/res/res/values/public.xml
View File

@@ -1250,8 +1250,7 @@
<public type="attr" name="logo" id="0x010102be" /> <public type="attr" name="logo" id="0x010102be" />
<public type="attr" name="xlargeScreens" id="0x010102bf" /> <public type="attr" name="xlargeScreens" id="0x010102bf" />
<public type="attr" name="cantSaveState" id="0x010102c0" /> <public type="attr" name="immersive" id="0x010102c0" />
<public type="attr" name="immersive" id="0x010102c1" />
<public-padding type="attr" name="kraken_resource_pad" end="0x01010300" /> <public-padding type="attr" name="kraken_resource_pad" end="0x01010300" />
<public-padding type="id" name="kraken_resource_pad" end="0x01020040" /> <public-padding type="id" name="kraken_resource_pad" end="0x01020040" />