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

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

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

Change-Id: Ic26258dd1ef7a0f3c7c802d764f83a272c3d519f
parents 3429aac7 28417f49
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