Wayne Ma 23752d475a Merge "Backwards-incompatible resolv module API change for making setResolverConfiguration take a parcelable." am: 59d332387c ...

am: 1d6c748213

Change-Id: I6dc9029af0df0d3b391210bd315516bdf1b5e4c9

2019-04-17 07:26:59 -07:00

..

android

Merge changes I4f181789,Ia8a0c99b am: 6efdc4a6cd

2019-04-12 06:37:28 -07:00

com/android

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

2019-04-17 07:26:59 -07:00