commit 589256d0dc6075645e477141f7119157ece04fb7
author Bill Yi <byi@google.com> Wed Oct 24 14:48:16 2018 -0700
committer Bill Yi <byi@google.com> Wed Oct 24 14:48:16 2018 -0700
tree 42f1c5f412a151ca88f5ec38b11ad0291243c136
parent d48d285664e672f9dfa41c3637b3fb36455c1541
parent 20cfc76d65b887d9f34917c6a506b6e9cc834d71

Merge pie-platform-release to aosp-master - DO NOT MERGE

Change-Id: I19c883c67a9cb27b8a2221da316fadb7a71768f7

Android.mk

diff --git a/Android.mk b/Android.mk
index e2a9ed5..60bd504 100644
--- a/Android.mk
+++ b/Android.mk
@@ -51,6 +51,7 @@
 LOCAL_MODULE := wifilogd_unit_test
 LOCAL_COMPATIBILITY_SUITE := device-tests
 LOCAL_CPPFLAGS := $(wifilogd_cpp_flags) $(wifilogd_gtest_cpp_flags)
+
 LOCAL_C_INCLUDES := $(wifilogd_includes)
 LOCAL_SRC_FILES := \
     tests/byte_buffer_unittest.cpp \

OWNERS

diff --git a/OWNERS b/OWNERS
index e442185..3d11524 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,2 +1,2 @@
-zqiu@google.com
-quiche@google.com
+etancohen@google.com
+rpius@google.com