tree a9c2498e17b0d12bfc13f9078707aa90747599c1
parent 3e8d3939dcc682ee3e680fcabbf5dd2c6842601a
parent c99811a1b31512635f51ef0007b8329b77a4c759
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1634002132 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1634002132 +0000

Snap for 7814173 from c99811a1b31512635f51ef0007b8329b77a4c759 to mainline-resolv-release

Change-Id: I29a3d944e83347cc86aef6345fc4f3984b5b01ff