[automerger skipped] Merge "Backwards-incompatible resolv module API change for making setResolverConfiguration take a parcelable." into qt-dev am: cce8a9da85 -s ours
am:f93c79666f-s ours am skip reason: change_id I6dc9029af0df0d3b391210bd315516bdf1b5e4c9 with SHA189ddc90b91is in history Change-Id: Id15d4dc0e60c8506cd9b7b7a4f91d0d5348dd896
This commit is contained in: