Skip to content
Commit 7866c679 authored by Wayne Ma's avatar Wayne Ma Committed by android-build-merger
Browse files

[automerger skipped] Merge "Backwards-incompatible resolv module API change... 

[automerger skipped] Merge "Backwards-incompatible resolv module API change for making setResolverConfiguration take a parcelable." into qt-dev
am: e9635d80 -s ours
am skip reason: change_id I6dc9029af0df0d3b391210bd315516bdf1b5e4c9 with SHA1 23752d47 is in history

Change-Id: Ie9bfef68a5c78272d4c7b31e9427ba2f5c57d056
parents 0db85857 e9635d80
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment