diff options
| author | Jeff Brown <jeffbrown@google.com> | 2010-06-17 13:57:05 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-17 13:57:05 -0700 |
| commit | 7cbd36f8d78d682ffbe264e08979e714ce0aa8c6 (patch) | |
| tree | 2bc6d45256fea5bf8cf369f2a808b5df5cfd90c2 | |
| parent | 3b970e78d2974eacc621258bb6e581d458d9bbd3 (diff) | |
| parent | 29f28cfe2188179519094e35d7fad09588170e88 (diff) | |
| download | frameworks_base-7cbd36f8d78d682ffbe264e08979e714ce0aa8c6.zip frameworks_base-7cbd36f8d78d682ffbe264e08979e714ce0aa8c6.tar.gz frameworks_base-7cbd36f8d78d682ffbe264e08979e714ce0aa8c6.tar.bz2 | |
am 29f28cfe: am e899caf8: Fixed api/current.xml after a bad merge.
Merge commit '29f28cfe2188179519094e35d7fad09588170e88'
* commit '29f28cfe2188179519094e35d7fad09588170e88':
Fixed api/current.xml after a bad merge.
| -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 da21f54..966154a 100644 --- a/api/current.xml +++ b/api/current.xml @@ -180121,7 +180121,7 @@ synchronized="false" static="true" final="false" - deprecated="deprecated" + deprecated="not deprecated" visibility="public" > <parameter name="downTime" type="long"> @@ -180156,7 +180156,7 @@ synchronized="false" static="true" final="false" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > <parameter name="downTime" type="long"> |