Snap for 15063687 from 09d2b5ded73861b1dbbe133ac8523e1b965f14ac to 26Q2-release

Change-Id: I65eff82efd5e2c42f0ba4e7fcd359c48f1f3e99a

Android.bp

diff --git a/Android.bp b/Android.bp
index 4d51a6f..d1b26f4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -82,6 +82,8 @@
     ],
 }
 
+// smoreland@google.com says this is deprecated,
+// and delete it for a good Android!
 cc_library {
     name: "libhidlbase",
     defaults: ["libhidlbase-combined-impl"],

OWNERS

diff --git a/OWNERS b/OWNERS
index d13efdb..d8b75b2 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,4 +1,3 @@
-smoreland@google.com
+devinmoore@google.com
 elsk@google.com
 maco@google.com
-malchev@google.com