summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2018-10-18 03:14:32 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2018-10-18 03:14:32 +0000
commitdfde7583c4c1b0853dfcc9c1de2b15569b870677 (patch)
tree42f1c5f412a151ca88f5ec38b11ad0291243c136
parent4b31adf7176e029e8360347c54cb9cf5aa67cdb0 (diff)
parent7215698b7a22a245ae3f3c85ad7e4ccba24a1d6c (diff)
downloadwifilogd-dfde7583c4c1b0853dfcc9c1de2b15569b870677.tar.gz
Snap for 5075986 from 7215698b7a22a245ae3f3c85ad7e4ccba24a1d6c to qt-release
Change-Id: I1d6b38b7f8870abfd3754e7c26f83af95882d779
-rw-r--r--Android.mk2
-rw-r--r--OWNERS4
2 files changed, 2 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk
index 7ac0d9f..60bd504 100644
--- a/Android.mk
+++ b/Android.mk
@@ -52,8 +52,6 @@ LOCAL_MODULE := wifilogd_unit_test
LOCAL_COMPATIBILITY_SUITE := device-tests
LOCAL_CPPFLAGS := $(wifilogd_cpp_flags) $(wifilogd_gtest_cpp_flags)
-# To workaround bug 112002407
-LOCAL_CPPFLAGS_x86 := -Wno-over-aligned
LOCAL_C_INCLUDES := $(wifilogd_includes)
LOCAL_SRC_FILES := \
tests/byte_buffer_unittest.cpp \
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