diff options
| author | Andreas Huber <andih@google.com> | 2010-09-01 14:53:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-01 14:53:12 -0700 |
| commit | 4fd76ba2270da1df12ae11f6d3d3ed564e38464b (patch) | |
| tree | 69007b352f14c384546717cf1fb850d3ccd24190 | |
| parent | 9088a3d153ef28dfa383fda0935d99bdc0c2b2f6 (diff) | |
| parent | 81f339bcfeee5dccb284cdeac6941179f91fe08b (diff) | |
| download | frameworks_base-4fd76ba2270da1df12ae11f6d3d3ed564e38464b.zip frameworks_base-4fd76ba2270da1df12ae11f6d3d3ed564e38464b.tar.gz frameworks_base-4fd76ba2270da1df12ae11f6d3d3ed564e38464b.tar.bz2 | |
am 81f339bc: Merge "Fixing the build." into gingerbread
Merge commit '81f339bcfeee5dccb284cdeac6941179f91fe08b' into gingerbread-plus-aosp
* commit '81f339bcfeee5dccb284cdeac6941179f91fe08b':
Fixing the build.
| -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 6161020..4f4986f 100644 --- a/api/current.xml +++ b/api/current.xml @@ -203601,7 +203601,7 @@ synchronized="true" static="false" final="false" - deprecated="deprecated" + deprecated="not deprecated" visibility="public" > </method> @@ -204149,7 +204149,7 @@ synchronized="true" static="false" final="false" - deprecated="deprecated" + deprecated="not deprecated" visibility="public" > <parameter name="pluginsPath" type="java.lang.String"> |