Snap for 8564071 from eecd299d4e9d29efb6d9c87a5fe7cfc67c0c4ab6 to mainline-adbd-releaseaml_adb_331610000aml_adb_331314020aml_adb_331113120aml_adb_331011050aml_adb_331011040android13-mainline-adbd-release

Change-Id: Ia4cb5b606bd8f77681d330ffd87ce07312d3f2bc

3 files changed, 10 insertions, 7 deletions

diff --git a/Android.bp b/Android.bp
index 5b9941a3..e653f3fc 100644
--- a/Android.bp
+++ b/Android.bp
@@ -65,4 +65,9 @@ java_library {
     ],
 
     sdk_version: "core_current",
+    // SLF4J is used by mockftpserver, both of them are used in tests only.
+    visibility: [
+        "//external/mockftpserver",
+        "//libcore",
+    ],
 }
diff --git a/METADATA b/METADATA
index 9b058bb3..7ae255df 100644
--- a/METADATA
+++ b/METADATA
@@ -1,6 +1,6 @@
 third_party {
-  # would be NOTICE save for:
-  #   log4j-over-slf4j/compatibility/src/main/java/test/Log4j12Calls.java
-  #   log4j-over-slf4j/compatibility/src/main/java/test/Log4j13Calls.java
+  license_note: "would be NOTICE save for:\n"
+  "   log4j-over-slf4j/compatibility/src/main/java/test/Log4j12Calls.java\n"
+  "   log4j-over-slf4j/compatibility/src/main/java/test/Log4j13Calls.java"
   license_type: RESTRICTED
 }
diff --git a/OWNERS b/OWNERS
index 3176d4a8..2d365747 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,4 +1,2 @@
-# This project was last update 4 years ago by ceki@qos.ch?
-# Please update this list if you find better candidates.
-jeffbailey@google.com
-rtenneti@google.com
+# Bug component: 24949
+include platform/libcore:/OWNERS