tree cb5d18b7a9d4ef2d6c13ce0838be6b35a32954cf
parent 5f5bbffb145783760dd0c9af2f4e5dfa4a327a4e
parent c7af83f4ff49e31443eee103b84a63e0e192d871
author Ken Chen <cken@google.com> 1545159011 -0800
committer android-build-merger <android-build-merger@google.com> 1545159011 -0800

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

Change-Id: I43080dc7922ab6b8b1c61f7a2542dd8cead45bc5