tree c42ec7e9e33910de8020ca1655bba752ff9dd23f
parent 20413a0609a3c70f53fa7c5a1622ae7ba0f094fb
parent 1d6c748213f1952e236f16894cebe76523e328d0
author Wayne Ma <waynema@google.com> 1555511219 -0700
committer android-build-merger <android-build-merger@google.com> 1555511219 -0700

Merge "Backwards-incompatible resolv module API change for making setResolverConfiguration take a parcelable." am: 59d332387c
am: 1d6c748213

Change-Id: I6dc9029af0df0d3b391210bd315516bdf1b5e4c9