tree efbbd87eb112fe58c9ee90a8d6a905b2ae3fd15b
parent c84e33b3f16496c710722039fa0566ae76c6acfc
parent 28417f4982159d579888d5e2aacf0e101c05fb89
author Wayne Ma <waynema@google.com> 1556111159 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1556111159 +0000

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