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

Commit 4a12bd54 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: 0d7b165d15 -s ours
am skip reason: change_id I699d14867b8760267a2c78e7149d555262dcb692 with SHA1 172a4f91a1 is in history

Change-Id: Id3586a62941e7ea46b5f3a8d835fd77fa858f734
parents ea8d7b84 793ac3e8

There are no changes