commit 0c34ee698edcd3bdfa4a1d26224e1ed1b96a9238
author Tor Norbye <tnorbye@google.com> Wed Dec 18 22:22:13 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 18 22:22:14 2013 +0000
tree cb04b516553d9bfe75d280221ad106851f5703a8
parent ffb96bf3b1b223e5df232d2217a98fb2294aa237
parent bbc75f34e6b43c8310fb1deff02b0508acdf9659

Merge "Hide NonNull and Nullable."

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index fee5559..32a950c 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -2682,12 +2682,6 @@
 
 package android.annotation {
 
-  public abstract class NonNull implements java.lang.annotation.Annotation {
-  }
-
-  public abstract class Nullable implements java.lang.annotation.Annotation {
-  }
-
   public abstract class SuppressLint implements java.lang.annotation.Annotation {
   }
 

core/java/android/annotation/NonNull.java

diff --git a/core/java/android/annotation/NonNull.java b/core/java/android/annotation/NonNull.java
index 8e604f0..3ca9eea 100644
--- a/core/java/android/annotation/NonNull.java
+++ b/core/java/android/annotation/NonNull.java
@@ -27,6 +27,8 @@
  * Denotes that a parameter, field or method return value can never be null.
  * <p>
  * This is a marker annotation and it has no specific attributes.
+ *
+ * @hide
  */
 @Retention(SOURCE)
 @Target({METHOD, PARAMETER, FIELD})

core/java/android/annotation/Nullable.java

diff --git a/core/java/android/annotation/Nullable.java b/core/java/android/annotation/Nullable.java
index cdba2f6..43f42fa 100644
--- a/core/java/android/annotation/Nullable.java
+++ b/core/java/android/annotation/Nullable.java
@@ -34,6 +34,8 @@
  * null.
  * <p>
  * This is a marker annotation and it has no specific attributes.
+ *
+ * @hide
  */
 @Retention(SOURCE)
 @Target({METHOD, PARAMETER, FIELD})