commit 79bd8e881510d62f0fd7198f21dba42a06bec7b8
author Neil Fuller <nfuller@google.com> Fri Jan 29 16:18:32 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jan 29 16:18:32 2016 +0000
tree 7ed8742be503c73f2018c2408b92adfe638cf0d0
parent 796da660120fc692a1d721f7d105aa2dc72cb62f
parent 45a1ea33a4e0eb7f1204c03611caf4699ed91d47

Merge "Unhide @FunctionalInterface"
am: 45a1ea33a4

* commit '45a1ea33a4e0eb7f1204c03611caf4699ed91d47':
  Unhide @FunctionalInterface

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index cd9741d..bc3b007 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -48429,6 +48429,9 @@
     field public static final java.lang.Class<java.lang.Float> TYPE;
   }
 
+  public abstract class FunctionalInterface implements java.lang.annotation.Annotation {
+  }
+
   public class IllegalAccessError extends java.lang.IncompatibleClassChangeError {
     ctor public IllegalAccessError();
     ctor public IllegalAccessError(java.lang.String);

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 821027f..97a4290 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -51047,6 +51047,9 @@
     field public static final java.lang.Class<java.lang.Float> TYPE;
   }
 
+  public abstract class FunctionalInterface implements java.lang.annotation.Annotation {
+  }
+
   public class IllegalAccessError extends java.lang.IncompatibleClassChangeError {
     ctor public IllegalAccessError();
     ctor public IllegalAccessError(java.lang.String);