diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-10-24 18:38:11 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-24 18:38:11 -0700 |
| commit | c2f78020d3887539fc90230d96465e4b1dc84d8e (patch) | |
| tree | c71f7293dfae5566b7ad688ddf33a676753c35ef /api | |
| parent | 2ef36763700eff5679d6012e7f078c57f1a4c465 (diff) | |
| parent | 236568999411214ef440cabc6d12e3bf5f19d8f4 (diff) | |
| download | frameworks_base-c2f78020d3887539fc90230d96465e4b1dc84d8e.zip frameworks_base-c2f78020d3887539fc90230d96465e4b1dc84d8e.tar.gz frameworks_base-c2f78020d3887539fc90230d96465e4b1dc84d8e.tar.bz2 | |
am 23656899: Merge "Fix issue #3126018: No way to specify NativeActivity\'s native method" into gingerbread
Merge commit '236568999411214ef440cabc6d12e3bf5f19d8f4' into gingerbread-plus-aosp
* commit '236568999411214ef440cabc6d12e3bf5f19d8f4':
Fix issue #3126018: No way to specify NativeActivity's native method
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/api/current.xml b/api/current.xml index 00a388b..bfd8915 100644 --- a/api/current.xml +++ b/api/current.xml @@ -23865,11 +23865,11 @@ <parameter name="holder" type="android.view.SurfaceHolder"> </parameter> </method> -<field name="KEY_NATIVE_SAVED_STATE" +<field name="META_DATA_FUNC_NAME" type="java.lang.String" transient="false" volatile="false" - value=""android:native_state"" + value=""android.app.func_name"" static="true" final="true" deprecated="not deprecated" |