diff options
author | Josh Gao <jmgao@google.com> | 2016-04-28 02:17:35 +0000 |
---|---|---|
committer | Xin Li <delphij@google.com> | 2016-05-12 00:59:16 +0000 |
commit | febb3d86bb846b4fc40cfa170728a8c42a9a7c7f (patch) | |
tree | 4cf2068cca20003818e3ba11d1b7d25745d9a0a7 | |
parent | e1c609bdd93dad9a2c454a732efb3046bbfdf38f (diff) | |
download | platform_external_iproute2-nougat-mr0.5-release.tar.gz platform_external_iproute2-nougat-mr0.5-release.tar.bz2 platform_external_iproute2-nougat-mr0.5-release.zip |
Merge "ss: remove wtf." am: 4bf8496 am: d9cdcb0 am: 1404f4candroid-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7android-n-iot-release-ihome-igv1android-n-iot-preview-4android-n-iot-preview-2android-cts-7.0_r9android-cts-7.0_r8android-cts-7.0_r7android-cts-7.0_r6android-cts-7.0_r5android-cts-7.0_r4android-cts-7.0_r33android-cts-7.0_r32android-cts-7.0_r31android-cts-7.0_r30android-cts-7.0_r3android-cts-7.0_r29android-cts-7.0_r28android-cts-7.0_r27android-cts-7.0_r26android-cts-7.0_r25android-cts-7.0_r24android-cts-7.0_r23android-cts-7.0_r22android-cts-7.0_r21android-cts-7.0_r20android-cts-7.0_r2android-cts-7.0_r19android-cts-7.0_r18android-cts-7.0_r17android-cts-7.0_r16android-cts-7.0_r15android-cts-7.0_r14android-cts-7.0_r13android-cts-7.0_r12android-cts-7.0_r11android-cts-7.0_r10android-cts-7.0_r1android-7.0.0_r7android-7.0.0_r6android-7.0.0_r5android-7.0.0_r4android-7.0.0_r36android-7.0.0_r35android-7.0.0_r34android-7.0.0_r33android-7.0.0_r32android-7.0.0_r31android-7.0.0_r30android-7.0.0_r3android-7.0.0_r29android-7.0.0_r28android-7.0.0_r27android-7.0.0_r24android-7.0.0_r21android-7.0.0_r19android-7.0.0_r17android-7.0.0_r15android-7.0.0_r14android-7.0.0_r13android-7.0.0_r12android-7.0.0_r1nougat-releasenougat-mr0.5-releasenougat-iot-releasenougat-devnougat-cts-releasen-iot-preview-4n-iot-preview-2
am: 465a65c
* commit '465a65c65df2b60a6010a56511378598917ce8b0':
ss: remove wtf.
Change-Id: Ib3ad0ca4e20765e5785850527adc4b702fcedaf4
(cherry picked from commit d60f0fa0525eb1b31605ef706585e850ae4c9f59)
BUG: 28704419
-rw-r--r-- | misc/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/misc/Android.mk b/misc/Android.mk index 5104fdd1..68678959 100644 --- a/misc/Android.mk +++ b/misc/Android.mk @@ -26,7 +26,7 @@ LOCAL_CFLAGS := \ -Wno-tautological-pointer-compare \ -Wno-unused-parameter \ -Werror \ - '-Dsethostent=cos' \ + '-Dsethostent(x)=' \ $(yacc_flags) \ -DHAVE_SETNS |