commit dad9c8a9802ca05dd4e2a0ca7faee71b82129898
author markchien <markchien@google.com> Wed Aug 28 17:25:17 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Aug 28 17:25:17 2019 -0700
tree 5a96eb316dba8acbcbaeb4b13b3a3b4c9f558dd3
parent f2e813063596d299240583a86e542f69dc0acf5f
parent ddbd12377c09565f339cbef3f1286fdfab0c947c

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 skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history

Change-Id: I3ccc63a60e9fa465f391b1378b6b7be0c4749286