tree e22b2f9ce49fc51e81d8b823a97f100a4576f316
parent 8c74e1a7c015166585a744dcc784f762b9d27b0b
parent 135168455f7969eb9944ab6c517296a823c9e6cd
author Wayne Ma <waynema@google.com> 1555509491 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1555509491 +0000

Merge "Backwards-incompatible resolv module API change for making setResolverConfiguration take a parcelable."