tree 914a7106a4477f983da730804301c16ec2672626
parent 911799c0222d630d907d385a896653735c3a8b4e
parent 2ec002cfc36a9abb0200938f0c05fe71fe02a809
author Bernie Innocenti <codewiz@google.com> 1560941202 -0700
committer android-build-merger <android-build-merger@google.com> 1560941202 -0700

Merge "Make resolv_stress_test run as root" am: 268a55184f am: 5419167d2a
am: 7a7bb572e0

Change-Id: Id0585b574e27afdcafd119b19771bfa5a3dd0207