commit f20182a83f58339a50f80cac0201e8160810af33
author markchien <markchien@google.com> Mon Aug 26 17:29:35 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Aug 26 17:29:35 2019 -0700
tree 4ca1b50e4c44e76c590b41a8515d7cc8d006a743
parent 1baab27e776c9a6b65370405c7e24d7e73616496
parent 6705fff9791d478c41dff37d9e5f525269aa2f1a

Merge "Merge "Merge "[automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: 63dda3513d -s ours am: 335491989f -s ours am: 4f182df10a -s ours am: c347654003 -s ours am: 2720cfb7ad -s ours
am: 6705fff979 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history

Change-Id: I6e6bc89124668efcb3fe900d41ed3838c81af574