tree da7dc9bd4704448ad0e11e19b9d7beaeb8fb547b
parent d3f604a9d6938636e9b309038992d1b5e9bd44be
parent d8dec0ca80f1c94cce7cb10f7d85476180f9b241
author Ken Chen <cken@google.com> 1545160130 -0800
committer android-build-merger <android-build-merger@google.com> 1545160130 -0800

Merge "Remove 'hasDns' parameter" am: 3176e8be7a am: c7af83f4ff
am: d8dec0ca80

Change-Id: Id10bcc14ad837b8a358e8be70f36a6cfc94620ab