tree bbc835ba43b6c369df9bb8b05020fa4d1258633d
parent be141b14536f19853c3713f9c3545af0e215b0a5
parent 80a734f146a80f3d4b9d2d6d76058a831e963420
author Josh Gao <jmgao@google.com> 1574373865 -0800
committer android-build-merger <android-build-merger@google.com> 1574373865 -0800

Merge "Allow the adb server to bind on ::1"
am: 80a734f146

Change-Id: I11c94f09eeb36bf42d632c15b689e8c7b43e3c16