diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-08-27 18:10:49 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-27 18:10:49 -0700 |
| commit | 405951b59c409d6b4da0fc74a62b75e67804d82d (patch) | |
| tree | 296701b10786abc4f4f306ba6662dbcfe5f25186 /api | |
| parent | 59e61354801b378c074b85f0dea0da62481298c9 (diff) | |
| parent | 8da20dd03797dcdc1f417fe9cebc21825551dd69 (diff) | |
| download | frameworks_base-405951b59c409d6b4da0fc74a62b75e67804d82d.zip frameworks_base-405951b59c409d6b4da0fc74a62b75e67804d82d.tar.gz frameworks_base-405951b59c409d6b4da0fc74a62b75e67804d82d.tar.bz2 | |
am 8da20dd0: am 4f8c2f26: Fix docs build.
Merge commit '8da20dd03797dcdc1f417fe9cebc21825551dd69'
* commit '8da20dd03797dcdc1f417fe9cebc21825551dd69':
Fix docs build.
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.xml | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/api/current.xml b/api/current.xml index aba3c92..dfe58b9 100644 --- a/api/current.xml +++ b/api/current.xml @@ -4996,7 +4996,7 @@ type="int" transient="false" volatile="false" - value="16843457" + value="16843456" static="true" final="true" deprecated="not deprecated" @@ -6202,6 +6202,17 @@ 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" |