tree 149832d945960145211ab93a33f662b457aa1d24
parent a8f9900a07abb8facc46fc7ede32c594680e9d99
parent 6788bee16f30e8fc83078597ac34c67b9098602f
author Lorenzo Colitti <lorenzo@google.com> 1628276364 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1628276364 +0000

[automerger skipped] Make resolverOptions in ResolverParamsParcel nullable and add a new IPC setResolverOption am: 6788bee16f -s ours

am skip reason: Merged-In I81f4b12dbb06783b72883572926b2e423220a9f7 with SHA-1 87208e2598 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/DnsResolver/+/15482198

Change-Id: Ibf8e6f7df0af76c11a29de160709ab9637cb6746