commit c658752f0b3b43872d62138bdf52ecf5f4b2f9c7
author markchien <markchien@google.com> Wed Aug 28 20:41:19 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Aug 28 20:41:19 2019 -0700
tree f8229f09a6dcfa807dc05fd52e4fbd1951d1dabb
parent e2718986d18253e4d08c0974e099285b61030892
parent 5af794bd455b2a9218211fe3aacfa4f18e834295

Merge "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: 0cfcb1a472 -s ours am: ddbd12377c -s ours am: dad9c8a980 -s ours am: 718f123cfc -s ours
am: 5af794bd45 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history

Change-Id: Ib0b2c8c9136fd1e2d15ec96e8cf5b5cc3ad1390f