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