tree 77c901caa426222de66c9d17805d5f6d6935566b
parent ec9ca3a5f3c51f05c146557a7c14d78f2b9fe12f
parent 8ac3fc941c0b92ad3d448ac129898ab4907a3f9c
author Chih-hung Hsieh <chh@google.com> 1511229977 +0000
committer android-build-merger <android-build-merger@google.com> 1511229977 +0000

Merge "Explicit -Wno-error in external/mdnsresponder" am: 1ecc27fd90
am: 8ac3fc941c

Change-Id: Ic0e88aa43426115e7df82ddb4482fe15d968eea5