tree 4ef236d4103cf2993efc9ec1ca6fcf44c0dd85ff
parent 3a87a392d6588f5786f12e7088d891a845e512f0
parent 46b849f3633f8ddd20e026df29e5f586d40376a6
author Rubin Xu <rubinxu@google.com> 1568368371 -0700
committer android-build-merger <android-build-merger@google.com> 1568368371 -0700

[automerger] Fix use-after-free in proxy resolver am: ed9838b89e am: cdc21af3ac am: 44ef83511e
am: 46b849f363

Change-Id: Ibccc0e27cdba31c8a3820a34abf9135c0b669a41