Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 66b1f90c 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: 0d7b165d -s ours
am: 48b1a0e9 -s ours
am skip reason: change_id I699d14867b8760267a2c78e7149d555262dcb692 with SHA1 172a4f91 is in history

Change-Id: Id1e8fd5f66eef37e25a2a9e38e9f33dcee47d8f1
parents 00b05046 48b1a0e9
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment