tree a16eee41776247d858eb52db4f37f00c1c81b8d0
parent 3592095637f0c646b50362733769ec817d3b63a0
parent 1696a4377d4a49ba0351421fb59f20757d890c44
author Android Merger <noreply-android-build-merger@google.com> 1553897184 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1553897184 +0000

Merge "Merge "[automerger skipped] Merge "RESTRICT AUTOMERGE: Port "Exempt adb socket for hostside VpnTest" to Cts 8.1" into oreo-mr1-cts-dev am: af988f0d74 -s ours am: 8e3bef2416 -s ours am skip reason: subject contains skip directive"