tree e90abe15040a20382978a3a5340947788b736e70
parent 374db029eea143c8ca9380be477612663506dd7f
parent 59d332387cfad8f2d893953c332a1773af656d0e
author Wayne Ma <waynema@google.com> 1555510543 -0700
committer android-build-merger <android-build-merger@google.com> 1555510543 -0700

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

Change-Id: I429437f3f4c6f5159be907c287a9d59bceb537a5