tree 1205db0150ca959516338968c067329fac1d0aa2
parent 5ba51d8c7f9718c26cbddbcb7a004430b6e1374e
parent 8b25d6c7d825e160758aff6deb7652d0dcd47202
author Remi NGUYEN VAN <reminv@google.com> 1548922285 -0800
committer android-build-merger <android-build-merger@google.com> 1548922285 -0800

Merge changes from topic "bindprocess-resolv"
am: 8b25d6c7d8

Change-Id: I3aacc6c2ae5242e28eec6e9e8e2a9a4b3e4f715d