summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYi Kong <yikong@google.com>2016-06-16 16:16:00 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2016-06-16 16:16:00 +0000
commit18508516707c4254241ac1cb4285107b5c060c3c (patch)
tree039ab8273f4b2f8df774cca0674681dc113796b8
parent20d55a7779cd5e22e8aab51193a91e486b17d21b (diff)
parentaf823e0ebf987d5715d6df80b3c9335b4e3a2cdb (diff)
downloadbase-18508516707c4254241ac1cb4285107b5c060c3c.tar.gz
Merge "Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92"
-rw-r--r--api/current.txt3
-rw-r--r--api/system-current.txt3
2 files changed, 6 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index bacb4dd881dd..535eb113fd27 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -49413,6 +49413,9 @@ package java.lang.annotation {
public abstract class Inherited implements java.lang.annotation.Annotation {
}
+ public abstract class Native implements java.lang.annotation.Annotation {
+ }
+
public abstract class Repeatable implements java.lang.annotation.Annotation {
}
diff --git a/api/system-current.txt b/api/system-current.txt
index 271b0e801c45..d8c52ade4051 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -52031,6 +52031,9 @@ package java.lang.annotation {
public abstract class Inherited implements java.lang.annotation.Annotation {
}
+ public abstract class Native implements java.lang.annotation.Annotation {
+ }
+
public abstract class Repeatable implements java.lang.annotation.Annotation {
}