OSDN Git Service

[automerger skipped] Merge "Backwards-incompatible resolv module API change for makin...
authorWayne Ma <waynema@google.com>
Wed, 24 Apr 2019 20:31:59 +0000 (13:31 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 24 Apr 2019 20:31:59 +0000 (13:31 -0700)
commit91567dfd3e129f10214a37db6507b86216caff02
tree5f7939cfa3e7d58c3a3aef930a8004dc9324a0e0
parent1ca364d492f1b3e7144b4dfdda9a7c936dcbd157
parent7866c679c8f7841e288f92a116a434f13b473c2f
[automerger skipped] Merge "Backwards-incompatible resolv module API change for making setResolverConfiguration take a parcelable." into qt-dev am: e9635d80f1 -s ours
am: 7866c679c8 -s ours
am skip reason: change_id I6dc9029af0df0d3b391210bd315516bdf1b5e4c9 with SHA1 23752d475a is in history

Change-Id: Id15d4dc0e60c8506cd9b7b7a4f91d0d5348dd896