diff options
author | Anton Hansson <hansson@google.com> | 2020-05-28 09:17:58 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-28 09:17:58 +0000 |
commit | f8ed451a0345c26e447114342e1d95bc3ade645f (patch) | |
tree | b5e782e79b3a381a14970faef8de0e3142e0485e | |
parent | 206631ad0452444248c4f510c125c3991d2ebc4d (diff) | |
parent | 18b0758100fedf21a76b5fceba62fa6e8fe26ae5 (diff) | |
download | sdk-f8ed451a0345c26e447114342e1d95bc3ade645f.tar.gz |
Merge "Import new module-lib stubs post nullability removal" into rvc-dev am: 18b0758100
Change-Id: Ic7ab035e5eefedc933871cac284f08c7e357aea8
-rw-r--r-- | 30/module-lib/android-non-updatable.jar | bin | 4727705 -> 4834067 bytes | |||
-rw-r--r-- | 30/module-lib/android.jar | bin | 4727705 -> 4834067 bytes | |||
-rw-r--r-- | 30/module-lib/api/android-non-updatable.txt | 10 | ||||
-rw-r--r-- | 30/module-lib/api/android.txt | 10 |
4 files changed, 0 insertions, 20 deletions
diff --git a/30/module-lib/android-non-updatable.jar b/30/module-lib/android-non-updatable.jar Binary files differindex 8c8f86609..82b40c34c 100644 --- a/30/module-lib/android-non-updatable.jar +++ b/30/module-lib/android-non-updatable.jar diff --git a/30/module-lib/android.jar b/30/module-lib/android.jar Binary files differindex 8c8f86609..82b40c34c 100644 --- a/30/module-lib/android.jar +++ b/30/module-lib/android.jar diff --git a/30/module-lib/api/android-non-updatable.txt b/30/module-lib/api/android-non-updatable.txt index ac5a43f67..5d8a9cf75 100644 --- a/30/module-lib/api/android-non-updatable.txt +++ b/30/module-lib/api/android-non-updatable.txt @@ -1,14 +1,4 @@ // Signature format: 2.0 -package android.annotation { - - @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD}) public @interface NonNull { - } - - @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD}) public @interface Nullable { - } - -} - package android.os { public class StatsServiceManager { diff --git a/30/module-lib/api/android.txt b/30/module-lib/api/android.txt index e91fe2500..67afc3225 100644 --- a/30/module-lib/api/android.txt +++ b/30/module-lib/api/android.txt @@ -1,14 +1,4 @@ // Signature format: 2.0 -package android.annotation { - - @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD}) public @interface NonNull { - } - - @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD}) public @interface Nullable { - } - -} - package android.net { public final class TetheredClient implements android.os.Parcelable { |