Snap for 10453563 from 99ba05775fae7b9f7c16d54ea8a2b24b75595cfe to mainline-os-statsd-releaseaml_sta_341710000aml_sta_341615000aml_sta_341511040aml_sta_341410000aml_sta_341311010aml_sta_341114000aml_sta_341111000aml_sta_341010020aml_sta_340912000aml_sta_340911000aml_net_341111030android14-mainline-os-statsd-release

Change-Id: I488e84a68a75bb7de1fc6c3d6796c5f1782ef5a2

2 files changed, 1 insertions, 11 deletions

diff --git a/Android.bp b/Android.bp
index a027498..fee3adb 100644
--- a/Android.bp
+++ b/Android.bp
@@ -46,7 +46,6 @@ cc_library_static {
         "-DPTHREADPOOL_USE_CPUINFO=1",
         "-DPTHREADPOOL_USE_CONDVAR=1",
     ],
-    c_std: "gnu11",
     header_libs: [
         "fxdiv_headers",
     ],
diff --git a/OWNERS b/OWNERS
index a2cc597..203b753 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,11 +1,2 @@
-butlermichael@google.com
-dgross@google.com
-galarragas@google.com
-jeanluc@google.com
-levp@google.com
+include platform/packages/modules/NeuralNetworks:/NNAPI_OWNERS
 maratek@google.com
-miaowang@google.com
-pszczepaniak@google.com
-slavash@google.com
-vddang@google.com
-xusongw@google.com