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

Change-Id: I429437f3f4c6f5159be907c287a9d59bceb537a5
tree: b2f2774516f307c07471e1085109c908d12e31c3
  1. core/
  2. services/
  3. tests/