[automerger skipped] Backwards-incompatible resolv module API change for making setResolverConfiguration take a parcelable.
am:cd616ebc95-s ours am skip reason: change_id I6dc9029af0df0d3b391210bd315516bdf1b5e4c9 with SHA189ddc90b91is in history Change-Id: Ic26258dd1ef7a0f3c7c802d764f83a272c3d519f
This commit is contained in: