Merge "Backwards-incompatible resolv module API change for making setResolverConfiguration take a parcelable."
tree: 1ff9990bcea92072387ccd9a0b9c1404a4c86cc2
  1. core/
  2. services/
  3. tests/